优化

platform-common/src/main/java/com/platform/common/enums/DictTypeEnum.java

@@ -30,6 +30,8 @@ public enum DictTypeEnum {
     THIRD_PARTY_YONGYOU_LOGIN("LOGIN", "登录接口"),
     THIRD_PARTY_YONGYOU_INVENTORYLIST("INVENTORYLIST", "存量接口"),
     THIRD_PARTY_YONGYOU_GETSTOCK("GETSTOCK", "存量库存接口"),
+    ADD_SPARE("ADDSPARE", "新增物料接口"),
+
     THIRD_PARTY_YONGYOU_OTHEROUT("OTHEROUT", "出库申请单"),
     REMOTE_MEASURE("REMOTE_MEASURE", "设备遥测"),
     REMOTE_DEGREE("REMOTE_DEGREE", "设备电度"),

platform-common/src/main/java/com/platform/common/yongyou/request/AddSpareRequest.java

@@ -0,0 +1,10 @@
+package com.platform.common.yongyou.request;
+
+import lombok.Data;
+
+@Data
+public class AddSpareRequest extends BaseRequest{
+    private Inventory Inventory;
+    private String TradeID;
+
+}

platform-common/src/main/java/com/platform/common/yongyou/request/Inventory.java

@@ -1,58 +1,49 @@
 package com.platform.common.yongyou.request;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 
 @Data
 public class Inventory {
-    @JSONField(name="cInvCode")
     private String cInvCode;//存货编码
-    @JSONField(name="cInvAddCode")
     private String cInvAddCode;//存货代码
-    @JSONField(name="cInvName")
     private String cInvName;//存货名称
-    @JSONField(name="cInvStd")
     private String cInvStd;//规格型号
-    @JSONField(name="cInvCCode")
     private String cInvCCode;//存货分类编码
-    @JSONField(name="cGroupCode")
     private String cGroupCode;//计量单位组编码
-
-    @JSONField(name="cComUnitCode")
     private String cComUnitCode;//主计量单位编码
-    @JSONField(name="cShopUnit")
     private String cShopUnit;//零售计量单位 ，如果没有辅计量单位，为空
-    @JSONField(name="cInvDepCode")
     private String cInvDepCode;//生产部门
-    @JSONField(name="cValueType")
     private String cValueType;//计价方式
-    @JSONField(name="dSDate")
     private String dSDate; //启用日期
-
-    @JSONField(name="cSRPolicy")
     private String cSRPolicy;//供需政策
-    @JSONField(name="cPlanMethod")
     private String cPlanMethod;//计划方法
-    @JSONField(name="dInvCreateDatetime")
     private String dInvCreateDatetime;//建档日期
-    @JSONField(name="cModifyPerson")
     private String cModifyPerson;//变更人
-
-    @JSONField(name="dModifyDate")
     private String dModifyDate;//变更日期
-    @JSONField(name="cInvDefine1")
     private String cInvDefine1;//存货自定义项1
-
-    @JSONField(name="bSale")
     private boolean bSale;//是否销售
-
-    @JSONField(name="bSelf")
     private boolean bSelf;//是否自制
-
-    @JSONField(name="bComsume")
     private boolean bComsume;//是否生产耗用
-
-    @JSONField(name="iGroupType")
     private Integer iGroupType;//计量单位组类别 ，无换算率 为 0 ，固定换算率为 1
+    private boolean bPurchase;//是否外购
+    private Integer cPUComUnitCode;//采购默认计量单位编码 ，如果没有辅计量单位，为空
+    private Integer cSAComUnitCode;//销售默认计量单位编码 ，如果没有辅计量单位，为空
+    private Integer cSTComUnitCode;//库存默认计量单位编码 ，如果没有辅计量单位，为空
+    private Object cCAComUnitCode;//成本默认计量单位编码，如果没有辅计量单位，为空
+    private Integer iDrawType;//领料方式 ，直接领料为 0
+    private Integer iSupplyType;//供应类型 ，领用 为0
+    private boolean bInvBatch;//是否批次管理
+    private Integer iRequireTrackStyle;//需求跟踪方式
+    private boolean bBomMain;//允许BOM母件
+    private boolean bBomSub;//允许BOM子件
+    private boolean bProductBill;//允许生产订单
+    private Integer iPlanDefault;//计划默认属性，自制 1，委外 2，采购 3
+    private String cCreatePerson;//建档人
+    private boolean bFree1;//存货是否有自由项1，长度mm
+    private boolean bFree2;//存货是否有自由项2 ，表面处理
+    private boolean bFree3;//存货是否有自由项3 ， 材质硬度
+
+
+
 }

platform-common/src/main/java/com/platform/common/yongyou/response/AddSpareResponse.java

@@ -0,0 +1,15 @@
+package com.platform.common.yongyou.response;
+
+import lombok.Data;
+
+/**
+ * 现存量查询响应
+ */
+@Data
+public class AddSpareResponse{
+    boolean errcode;
+    String errmsg;
+    String id;
+    String tradeid;
+
+}

platform-dao/src/main/java/com/platform/dao/mapper/preparation/PreparationMapper.java

@@ -4,6 +4,7 @@ import com.platform.dao.dto.preparation.PreparationDTO;
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.entity.preparation.Preparation;
 import com.platform.dao.vo.query.preparation.PreparationVO;
+import com.platform.dao.vo.report.PreparationReportByStatusVO;
 import org.springframework.stereotype.Component;
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  */
 @Component
 public interface PreparationMapper extends MyMapper<Preparation> {
+    List<PreparationReportByStatusVO> getPreparationReportByStatusVO(PreparationDTO dto);
     /**
      * 分页查询
      * @param dto

platform-dao/src/main/resources/mapper/preparation/PreparationMapper.xml

@@ -172,6 +172,18 @@
         </where>
     </select>
 
+    <select id="getPreparationReportByStatusVO" resultType="com.platform.dao.vo.report.PreparationReportByStatusVO"
+            parameterType="com.platform.dao.dto.preparation.PreparationDTO">
+        select preparation.status,count(1) as num
+        from t_preparation as preparation join t_sys_user applyU on preparation.user_id = applyU.user_id
+        join t_sb_position sp on preparation.position_id = sp.id
+        join t_sys_dept dept on preparation.depart_id = dept.dept_id
+        <where>
+            <include refid="List_Condition"/>
+        </where>
+        group by status
+    </select>
+
     <select id="getCountByUserId" resultType="com.platform.dao.vo.query.preparation.PreparationVO"
     parameterType="com.platform.dao.dto.preparation.PreparationDTO">
         select status, count(1) counts from t_preparation

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -74,11 +74,10 @@ public class YongyouController {
     }
 
     @SysLog("新增物料发起")
-    @PutMapping("/add/spare")
-    public R addSpare(Inventory inventory) {
+    @PostMapping("/add/spare")
+    public R addSpare(@RequestBody Inventory inventory,@RequestParam Integer tokenType) {
 //        yongyouService.addOutForm(id, false);
-        yongyouService.addSpare(inventory);
-        return new R<>();
+        return new R<>(yongyouService.addSpare(inventory,tokenType));
     }
 
     /**

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -138,78 +138,18 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         dto.setCreatedTimeEnd(searchStartTime);
         dto.setCreatedTimeEnd(searchEndTime);
         List<PreparationVO> list = mapper.selectList(dto);
-        List<PreparationReportByStatusVO> result = new ArrayList<>();
-        Integer draftNum = 0;
-        Integer waiting_allocationNum = 0;
-        Integer allocationedNum = 0;
-        Integer complatedNum = 0;
-        Integer revokedNum = 0;
-        PreparationReportByStatusVO draft = new PreparationReportByStatusVO();
-        PreparationReportByStatusVO waiting = new PreparationReportByStatusVO();
-        PreparationReportByStatusVO allocationed = new PreparationReportByStatusVO();
-        PreparationReportByStatusVO complated = new PreparationReportByStatusVO();
-        PreparationReportByStatusVO revoked = new PreparationReportByStatusVO();
-        List<PreparationVO> draftList = new ArrayList<>();
-        List<PreparationVO> waitingList = new ArrayList<>();
-        List<PreparationVO> allocationedList = new ArrayList<>();
-        List<PreparationVO> complatedList = new ArrayList<>();
-        List<PreparationVO> revokedList = new ArrayList<>();
-        for (PreparationVO vo : list) {
-            if (DictCache.getValueByCode("REPAIR_PREPARATION_STATUS", "draft").equals(vo.getStatus())) {
-                draft.setStatusName("草稿");
-                draftList.add(vo);
-                draft.setStatus(0);
-                draftNum++;
-            } else if (DictCache.getValueByCode("REPAIR_PREPARATION_STATUS", "waiting_allocation").equals(vo.getStatus())) {
-                waiting.setStatusName("待分配");
-                waitingList.add(vo);
-                waiting.setStatus(1);
-                waiting_allocationNum++;
-            } else if (DictCache.getValueByCode("REPAIR_PREPARATION_STATUS", "allocationed").equals(vo.getStatus())) {
-                allocationed.setStatusName("已分配");
-                allocationedList.add(vo);
-                allocationed.setStatus(2);
-                allocationedNum++;
-            } else if (DictCache.getValueByCode("REPAIR_PREPARATION_STATUS", "complated").equals(vo.getStatus())) {
-                complated.setStatusName("已完成");
-                complatedList.add(vo);
-                complated.setStatus(3);
-                complatedNum++;
-            } else if (DictCache.getValueByCode("REPAIR_PREPARATION_STATUS", "revoked").equals(vo.getStatus())) {
-                revoked.setStatusName("已撤销");
-                revokedList.add(vo);
-                revoked.setStatus(4);
-                revokedNum++;
-            }
+        List<PreparationReportByStatusVO> preparationReportByStatusVOS = mapper.getPreparationReportByStatusVO(dto);
+        for (PreparationReportByStatusVO statusVO:preparationReportByStatusVOS){
+            List<PreparationVO> detailList = new ArrayList<>();
 
+            for (PreparationVO preparationVO:list){
+                if (preparationVO.getStatus().equals(statusVO.getStatus())){
+                    detailList.add(preparationVO);
+                }
+            }
+            statusVO.setDetailList(detailList);
         }
-        List<PreparationReportByStatusVO> list1 = new ArrayList<>();
-        if (draftNum != 0) {
-            draft.setNum(draftNum);
-            draft.setDetailList(draftList);
-            list1.add(draft);
-        }
-        if (waiting_allocationNum != 0) {
-            waiting.setNum(waiting_allocationNum);
-            waiting.setDetailList(waitingList);
-            list1.add(waiting);
-        }
-        if (allocationedNum != 0) {
-            allocationed.setNum(allocationedNum);
-            allocationed.setDetailList(allocationedList);
-            list1.add(allocationed);
-        }
-        if (complatedNum != 0) {
-            complated.setNum(complatedNum);
-            complated.setDetailList(complatedList);
-            list1.add(complated);
-        }
-        if (revokedNum != 0) {
-            revoked.setNum(revokedNum);
-            revoked.setDetailList(revokedList);
-            list1.add(revoked);
-        }
-        return list1;
+        return preparationReportByStatusVOS;
     }
 
     @Override

platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java

@@ -24,7 +24,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface YongyouService {
-    void addSpare(Inventory inventory);
+    String addSpare(Inventory inventory,Integer tokenType);
 
     /**
      * 分页查询备件列表

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -27,10 +27,7 @@ import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.service.store.OutStoreDetailService;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.service.yongyou.YongyouService;
-import handler.yongyou.GetCurrentStockHandler;
-import handler.yongyou.GetInventoryListHandler;
-import handler.yongyou.LoginHandler;
-import handler.yongyou.OtherOutHandler;
+import handler.yongyou.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -365,7 +362,26 @@ public class YongyouServiceImpl implements YongyouService {
     }
 
     @Override
-    public void addSpare(Inventory inventory) {
+    public String addSpare(Inventory inventory,Integer tokenType) {
+        AddSpareRequest request = new AddSpareRequest();
+        request.setInventory(inventory);
+        request.setTradeID("");
+        request.setToken(geToken(tokenType));
+        request.setConn(getConn2(tokenType));
+        if (tokenType==1){
+            request.setCAcc_ID(RedisUtils.get(cAcc_ID_key1));
+        }else if (tokenType==2){
+            request.setCAcc_ID(RedisUtils.get(cAcc_ID_key2));
+        }
+        AddSpareHandler handler = new AddSpareHandler();
+        handler.setRequest(request);
+        String responseStr = handler.handler();
+        AddSpareResponse response = JSONObject.parseObject(responseStr, AddSpareResponse.class);
+        if (response.isErrcode()){
+            return response.getErrmsg();
+        }else {
+            throw new BusinessException("新增失败！");
+        }
 
     }
 

platform-service/src/main/java/handler/yongyou/AddSpareHandler.java

@@ -0,0 +1,31 @@
+package handler.yongyou;
+
+import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.yongyou.request.AddSpareRequest;
+import com.platform.common.yongyou.request.BaseRequest;
+import com.platform.common.yongyou.request.GetCurrentStockRequest;
+import com.platform.common.yongyou.response.AddSpareResponse;
+import com.platform.common.yongyou.response.BaseResponse;
+import com.platform.common.yongyou.response.GetCurrentStockResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class AddSpareHandler extends BaseRequestHandler{
+
+    public AddSpareHandler(){
+        setServiceType(DictTypeEnum.ADD_SPARE.getType());
+    }
+
+    /**
+     * 获取分页数据
+     * @param req
+     * @param resp
+     */
+    @Override
+    public void successResponse(BaseRequest req, BaseResponse resp) {
+        AddSpareRequest request = (AddSpareRequest)req;
+//        AddSpareResponse response = (AddSpareResponse)resp;
+    }
+}