Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjCompleteVO.java

@@ -68,4 +68,16 @@ public class SjCompleteVO {
     @JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
     private Date putStoreTime;
 
+    @Schema(description = "镀种")
+    private String plate;
+
+    @Schema(description = "材料")
+    private String material;
+
+    @Schema(description = "子件类型")
+    private Integer yieldType;
+
+    @Schema(description = "子件类型")
+    private String yieldTypeName;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.java

@@ -29,6 +29,15 @@ public interface OemStatementMapper extends BaseMapper<OemStatementEntity> {
     List<StatementVO> selectOemStatementPage(IPage page, StatementQuery query);
 
 
+    /**
+     * 自定义列表查询
+     *
+     * @param query
+     * @return
+     */
+    List<StatementVO> selectOemStatement(@Param("query") StatementQuery query);
+
+
     /**
      * 获取导出数据
      *

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml

@@ -227,49 +227,49 @@
         AND os.ROS_STATUS = 4
     </select>
 
-    <select id="selectOemStatementPage" resultMap="statementVOResultMap">
+    <sql id="selectOemStatementSql">
         SELECT ID,
-            YP_CODE,
+        YP_CODE,
-            WO_CODE,
+        WO_CODE,
-            PART_ID,
+        PART_ID,
-            PART_CODE,
+        PART_CODE,
-            PART_NAME,
+        PART_NAME,
-            BATCH_NO,
+        BATCH_NO,
-            PRODUCT_IDENT,
+        PRODUCT_IDENT,
-            PPS_ID,
+        PPS_ID,
-            PS_CODE,
+        PS_CODE,
-            PS_NAME,
+        PS_NAME,
-            CA_ID,
+        CA_ID,
-            CA_NAME,
+        CA_NAME,
-            OC_ID,
+        OC_ID,
-            OC_CODE,
+        OC_CODE,
-            OC_NAME,
+        OC_NAME,
-            MAKE_QTY,
+        MAKE_QTY,
-            YP_AREA,
+        YP_AREA,
-            MAKE_QTY * YP_AREA as TOTAL_AREA,
+        MAKE_QTY * YP_AREA as TOTAL_AREA,
-            PLATE,
+        PLATE,
-            ROS_THICKNESS,
+        ROS_THICKNESS,
-            STANDARD_PROCESS_CODE,
+        STANDARD_PROCESS_CODE,
-            TSB_NUM,
+        TSB_NUM,
-            TSD_NUM,
+        TSD_NUM,
-            TJT_NUM,
+        TJT_NUM,
-            PLAN_DEPTCODE,
+        PLAN_DEPTCODE,
-            USE_DEPT_CODE,
+        USE_DEPT_CODE,
-            PUT_STORE_TIME,
+        PUT_STORE_TIME,
-            to_char(PUT_STORE_TIME, 'yyyy-MM-dd') as PUT_STORE_DATE,
+        to_char(PUT_STORE_TIME, 'yyyy-MM-dd') as PUT_STORE_DATE,
-            QUOTATION,
+        QUOTATION,
-            UNIT,
+        UNIT,
-            UNIT_PRICE,
+        UNIT_PRICE,
-            TOTAL_PRICE,
+        TOTAL_PRICE,
-            CASE WHEN ROS_STATUS = 3 THEN MEMO ELSE NULL END as MEMO,
+        CASE WHEN ROS_STATUS = 3 THEN MEMO ELSE NULL END as MEMO,
-            to_char(SETTLE_TIME, 'yyyy-MM-dd') as SETTLE_DATE,
+        to_char(SETTLE_TIME, 'yyyy-MM-dd') as SETTLE_DATE,
-            ROS_STATUS,
+        ROS_STATUS,
-            to_char(APPROVAL_TIME, 'yyyy-MM-dd') as APPROVAL_DATE,
+        to_char(APPROVAL_TIME, 'yyyy-MM-dd') as APPROVAL_DATE,
-            to_char(PUSH_TIME, 'yyyy-MM-dd') as PUSH_DATE,
+        to_char(PUSH_TIME, 'yyyy-MM-dd') as PUSH_DATE,
-            STATEMENT_NO,
+        STATEMENT_NO,
-            STATEMENT_CATEGORY_ID,
+        STATEMENT_CATEGORY_ID,
-            STATEMENT_CATEGORY,
+        STATEMENT_CATEGORY,
-            CARD_NO
+        CARD_NO
         FROM MES_OEM_STATEMENT
         <where>
             IS_DELETED = 0
@@ -356,9 +356,15 @@
                 order by PUT_STORE_TIME asc
             </otherwise>
         </choose>
+    </sql>
 
+    <select id="selectOemStatementPage" resultMap="statementVOResultMap">
+        <include refid="selectOemStatementSql"/>
     </select>
 
+    <select id="selectOemStatement" resultMap="statementVOResultMap">
+        <include refid="selectOemStatementSql"/>
+    </select>
 
     <select id="exportOemStatement" resultMap="statementExcelResultMap">
         SELECT ID,

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -276,9 +276,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         query.setWoCode(woCode);
         query.setRosStatusList("1");
         query.setManual("0");
-        IPage<StatementVO> page = new Page<>();
+        List<StatementVO> statementVOS = baseMapper.selectOemStatement(query);
-        page.setSize(999);
-        List<StatementVO> statementVOS = baseMapper.selectOemStatementPage(page, query);
         if (statementVOS == null || statementVOS.isEmpty()) {
             return R.fail(String.format("[%]无未结算的结算单", woCode));
         }
@@ -2045,9 +2043,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
 
     @Override
     public R manualSettlement(StatementQuery mesOemStatement) {
-        IPage<StatementVO> page = new Page<>();
+        List<StatementVO> statementVOS = baseMapper.selectOemStatement(mesOemStatement);
-        page.setSize(999);
-        List<StatementVO> statementVOS = baseMapper.selectOemStatementPage(page, mesOemStatement);
         statementVOS = statementVOS.stream().filter(vo -> {
             String memo = vo.getMemo();
             return !"无需结算".equals(memo) && !"重复镀后入库".equals(memo);
@@ -2075,9 +2071,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
 
     @Override
     public List<StatementVO> manualPreSettlement(StatementQuery mesOemStatement) {
-        IPage<StatementVO> page = new Page<>();
+        List<StatementVO> statementVOS = baseMapper.selectOemStatement(mesOemStatement);
-        page.setSize(999);
-        List<StatementVO> statementVOS = baseMapper.selectOemStatementPage(page, mesOemStatement);
         statementVOS = statementVOS.stream().filter(vo -> {
             String memo = vo.getMemo();
             return !"无需结算".equals(memo) && !"重复镀后入库".equals(memo);

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -190,13 +190,17 @@
         a.CARD_NO AS cardNo,
         a.PRODUCT_IDENT AS productIdent,
         a.YP_QTY AS ypQty,
-        a.YP_AREA AS ypArea,
+        ROUND(a.YP_QTY * a.YP_AREA , 6) AS ypArea,
         a.PRIORITY_ERP AS priorityErp,
         a.RELEASE_DATE AS releaseDate,
-        b.PUT_STORE_TIME AS putStoreTime
+        b.PUT_STORE_TIME AS putStoreTime,
+        a.PLATE AS plate,
+        a.YIELD_TYPE AS yieldType,
+        c.material AS material
         FROM
         MES_YIELD_ORDER a
         INNER JOIN MES_WORK_ORDER b ON a.id = b.yo_id
+        INNER JOIN DS_PART c ON a.part_code = c.part_code
         WHERE
         a.IS_DELETED = 0
         AND b.IS_DELETED = 0
@@ -228,13 +232,17 @@
         a.CARD_NO AS cardNo,
         a.PRODUCT_IDENT AS productIdent,
         a.YP_QTY AS ypQty,
-        a.YP_AREA AS ypArea,
+        ROUND(a.YP_QTY * a.YP_AREA , 6) AS ypArea,
         a.PRIORITY_ERP AS priorityErp,
         a.RELEASE_DATE AS releaseDate,
-        b.PUT_STORE_TIME AS putStoreTime
+        b.PUT_STORE_TIME AS putStoreTime,
+        a.PLATE AS plate,
+        a.YIELD_TYPE AS yieldType,
+        c.material AS material
         FROM
         MES_YIELD_ORDER a
         INNER JOIN MES_WORK_ORDER b ON a.id = b.yo_id
+        INNER JOIN DS_PART c ON a.part_code = c.part_code
         WHERE
         a.IS_DELETED = 0
         AND b.IS_DELETED = 0

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java

@@ -612,13 +612,13 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
                 // 修改车间订单数量
                 WorkOrder workOrder = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getCardNo, yieldOrder.getCardNo())).get(0);
                 if (workOrder != null) {
-//                WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
+                WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
-//                try {
+                try {
                     // erp接口调用更新数量
-//                    erpDataProduceClient.erpUpdateMakeQty(workOrderRun.getWoCode(), mesDataMaintainLog.getMemo(), mesDataMaintainLog.getQtyAfter(), AuthUtil.getUserName()).getData();
+                    erpDataProduceClient.erpUpdateMakeQty(workOrderRun.getWoCode(), dataMaintainLog.getMemo(), Double.valueOf(dataMaintainLog.getAfterValue()), AuthUtil.getUserName());
-//                } catch (Exception e) {
+                } catch (Exception e) {
-//                    throw new ServiceException("erp接口调用修改订单加工数量失败：" + e.getMessage());
+                    throw new ServiceException("erp接口调用修改订单加工数量失败：" + e.getMessage());
-//                }
+                }
                     double numAfter = Double.parseDouble(dataMaintainLog.getAfterValue());
                     double num = numAfter - yieldOrder.getYpQty();
                     yieldOrder.setYpQty(numAfter);

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java

@@ -787,12 +787,8 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
         }
         workOrder.setOcId(ocId);
         workOrderMapper.updateById(workOrder);
-        workPlans.forEach(workPlan -> {
+        workPlans.forEach(workPlan -> workPlan.setOcId(ocId));
-            workPlan.setOcId(ocId);
-        });
         List<BatchResult> batchResults = workPlanMapper.updateById(workPlans);
-        // todo:qyl 2.在MES更改后同步给ERP
-
         return null;
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -2998,7 +2998,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 }
             }
         }
-        subCompleteData.forEach(sjCompleteVO -> sjCompleteVO.setPriorityErpName(YieldOrderEnum.getName(sjCompleteVO.getPriorityErp())));
+        subCompleteData.forEach(sjCompleteVO -> {
+            sjCompleteVO.setPriorityErpName(YieldOrderEnum.getName(sjCompleteVO.getPriorityErp()));
+            sjCompleteVO.setYieldTypeName(YieldOrderEnum.getName(sjCompleteVO.getYieldType()));
+        });
         return subCompleteData;
     }