完善

platform-dao/src/main/java/com/platform/dao/vo/query/store/SpareStoreVO.java

@@ -59,6 +59,10 @@ public class SpareStoreVO extends BaseVO implements Serializable {
      * 图片
      */
     private String image;
+    /**
+     * 备件类型名称
+     */
+    private String spareTypeName;
     /**
      * 二维码
      */

platform-dao/src/main/resources/mapper/store/SpareStoreMapper.xml

@@ -151,7 +151,8 @@
         select sparestore.*, convert((sparestore.price * sparestore.num), decimal(10,2)) as totalPrice,
                store.name storeName,
                spareinfo.name spareName, spareinfo.no, spareinfo.ggxh, spareinfo.init_no,
-               spareinfo.unit, spareinfo.image
+               spareinfo.unit, spareinfo.image,
+               spareType.name spareTypeName
         from t_spare_store as sparestore
         left join t_store store on store.id = sparestore.store_id
         left join t_spare_part_info spareinfo on spareinfo.id = sparestore.spare_id
@@ -186,6 +187,9 @@
             <if test="initNo != null and initNo != ''">
                 and spareinfo.init_no like concat('%',#{initNo},'%')
             </if>
+            <if test="spareId != null and spareId != ''">
+                and spareinfo.id = #{spareId}
+            </if>
             <if test="typeNameLike != null and typeNameLike != ''">
                 and spareType.name like concat('%',#{typeNameLike},'%')
             </if>
@@ -202,10 +206,13 @@
     </select>
     <select id="selectDetail" parameterType="com.platform.dao.dto.store.SpareStoreDTO"
             resultType="com.platform.dao.vo.query.store.SpareStoreVO">
-        select sparestore.*, store.name storeName, spareinfo.name spareName, spareinfo.no, spareinfo.ggxh, spareinfo.unit, spareinfo.image
+        select sparestore.*, store.name storeName, spareinfo.name spareName, spareinfo.no,
+        spareinfo.ggxh, spareinfo.unit, spareinfo.image,
+        spareType.name spareTypeName
         from t_spare_store as sparestore
         left join t_store store on store.id = sparestore.store_id
         left join t_spare_part_info spareinfo on spareinfo.id = sparestore.spare_id
+        left join t_spare_type spareType on spareType.id = spareinfo.type_id
         where sparestore.id = #{id}
     </select>
 

platform-rest/src/main/java/com/platform/rest/controller/store/SpareStoreController.java

@@ -156,7 +156,7 @@ public class SpareStoreController {
    */
   @GetMapping("")
   public R query(SpareStoreDTO spareStoreDTO) {
-      return new R<>(spareStoreService.getModelListByDTO(spareStoreDTO));
+      return new R<>(spareStoreService.getListByDTO(spareStoreDTO));
   }
 
   /**

platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -204,6 +204,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             detail.setType(inStoreForm.getType());
             detail.setInId(inStoreForm.getId());
             detail.setInNo(inStoreForm.getInNo());
+            detail.setTotalPrice(detail.getNum().multiply(detail.getPrice()));
             totalPrice = totalPrice.add(detail.getTotalPrice());
             detail.setStoreId(inStoreForm.getStoreId());
             InStoreDetail storeDetail = new InStoreDetail();
@@ -221,6 +222,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         ;
         inStoreForm.setTotalPrice(totalPrice);
         mapper.updateByPrimaryKey(inStoreForm);
+        updateStore(inStoreForm.getId());
         return inStoreForm;
     }
 
@@ -292,12 +294,14 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
                 detail.setInId(model.getId());
                 detail.setStoreId(model.getStoreId());
                 detail.setInNo(model.getInNo());
+                detail.setTotalPrice(detail.getNum().multiply(detail.getPrice()));
                 totalPrice = totalPrice.add(detail.getTotalPrice());
                 InStoreDetail storeDetail = new InStoreDetail();
                 BeanConverterUtil.copyObjectProperties(detail, storeDetail);
                 storeDetail.setId(IdGeneratorUtils.getObjectId());
                 addDetailList.add(storeDetail);
             } else {
+                detail.setTotalPrice(detail.getNum().multiply(detail.getPrice()));
                 totalPrice = totalPrice.add(detail.getTotalPrice());
                 InStoreDetail storeDetail = new InStoreDetail();
                 BeanConverterUtil.copyObjectProperties(detail, storeDetail);

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -152,10 +152,10 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         List<OutStoreDetailDTO> detailList = model.getDetailList();
 
         // 获取领用单详情
-        SparePickForm sparePickForm = null;
+        /*SparePickForm sparePickForm = null;
         if(model.getType().equals(OutStoreTypeEnum.CHUKU_LINGYONG.getValue())){
             sparePickForm = sparePickFormMapper.selectByPrimaryKey(model.getPickId());
-        }
+        }*/
         BigDecimal totalPrice = new BigDecimal(0);
 
         // 判断备件是否在该仓库里面,出库单已经勾选了仓库。这个不允许了，pc和移动端都不允许
@@ -181,6 +181,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
             }
             // detail.setStoreId(outStoreForm.getStoreId());
             detail.setId(IdGeneratorUtils.getObjectId());
+            detail.setTotalPrice(detail.getNum().multiply(detail.getPrice()));
             totalPrice = totalPrice.add(detail.getTotalPrice());
             detail.setOutNo(outStoreForm.getOutNo());
             OutStoreDetail storeDetail = new OutStoreDetail();
@@ -192,6 +193,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         };
         outStoreForm.setTotalPrice(totalPrice);
         mapper.updateByPrimaryKey(outStoreForm);
+        updateStore(outStoreForm.getId());
         return outStoreForm;
     }
 
@@ -342,12 +344,14 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
                 }
                 //detail.setStoreId(model.getStoreId());
                 detail.setOutNo(model.getOutNo());
+                detail.setTotalPrice(detail.getNum().multiply(detail.getPrice()));
                 totalPrice = totalPrice.add(detail.getTotalPrice());
                 OutStoreDetail storeDetail = new OutStoreDetail();
                 BeanConverterUtil.copyObjectProperties(detail, storeDetail);
                 storeDetail.setId(IdGeneratorUtils.getObjectId());
                 addDetailList.add(storeDetail);
             }else{// 修改数量的
+                detail.setTotalPrice(detail.getNum().multiply(detail.getPrice()));
                 totalPrice = totalPrice.add(detail.getTotalPrice());
                 OutStoreDetail storeDetail = new OutStoreDetail();
                 BeanConverterUtil.copyObjectProperties(detail, storeDetail);

platform-service/src/main/java/com/platform/service/store/impl/SpareStoreServiceImpl.java

@@ -125,7 +125,7 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
      */
     @Override
     public AbstractPageResultBean<SpareStoreVO> selectPageList(SpareStoreDTO model, int pageNum, int pageSize) {
-        if (model.getFilter() != null && DataFilterTypeEnum.SELF.getValue() == model.getFilter().intValue()) {
+        /*if (model.getFilter() != null && DataFilterTypeEnum.SELF.getValue() == model.getFilter().intValue()) {
             UserInfo userInfo = SecurityUtils.getUserInfo();
             List<StoreVO> storeList = storeService.selectListByUserId(userInfo.getUserId());
             if(CollectionUtils.isEmpty(storeList)){
@@ -164,7 +164,7 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
                 throw new BusinessException("找不到该用户所属的分公司，请先设置，用户id:" + userInfo.getUserId());
             }
             model.setUseCompany(list.get(0).getDeptId());
-        }
+        }*/
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage<>(mapper.selectList(model));
     }