旧MES结算数据生成

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemStatementController.java

@@ -290,7 +290,7 @@ public class OemStatementController extends BladeController {
     @ApiOperationSupport(order = 18)
     @Operation(summary = "发起审批", description = "将所有待审核状态的结算数据提交审批，更新为审批中状态")
     @ApiLog("外协结算 发起审批")
-    public R submitApproval( @RequestBody SettlementConfirmRequestQuery request) {
+    public R submitApproval(@RequestBody SettlementConfirmRequestQuery request) {
         String settlementMemo = request.getSettlementMemo();
         return mesOemStatementService.submitApproval(settlementMemo);
     }
@@ -308,4 +308,17 @@ public class OemStatementController extends BladeController {
     }
 
 
+    /**
+     * 旧MES结算数据生成
+     *
+     * @param mesOemStatement
+     * @return
+     */
+    @PostMapping("/generateSettlementByMjMes")
+    @Operation(summary = "旧MES结算数据生成", description = "传入mesOemStatement")
+    public R generateSettlementByMjMes(@RequestBody StatementQuery mesOemStatement) {
+        return mesOemStatementService.generateSettlementByMjMes(mesOemStatement);
+    }
+
+
 }

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

@@ -395,8 +395,8 @@
         to_char(d.put_store_time, 'yyyy-MM-dd') as PUT_STORE_DATE,
         d.make_qty,
         d.make_qty * e.po_area as total_area,
-        f.plate_thickness as ROS_THICKNESS,
-        f.plate_thickness,
+        p.plate_thickness as ROS_THICKNESS,
+        p.plate_thickness,
         e.plate,
         e.part_code,
         e.prod_ident as PRODUCT_IDENT,
@@ -423,7 +423,6 @@
         INNER JOIN MJMES.bs_oem_customer c on a.oc_id = c.oc_id
         INNER JOIN MJMES.pr_work_order d ON a.wo_id = d.wo_id
         INNER JOIN MJMES.pj_yield_order e ON d.yo_id = e.yo_id
-        INNER JOIN MJMES.bs_plating f ON e.plate = f.plating
         INNER JOIN MES_OEM_PROCESS g ON a.pps_id = g.PROCESS_ID AND g.IS_DELETED = 0
         LEFT JOIN MES_OEM_STATEMENT h ON h.WP_ID = a.wp_id AND h.IS_DELETED = 0
         INNER JOIN BS_CRAFT_ABILITY i ON i.ID = a.CA_ID AND i.IS_DELETED = 0

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

@@ -158,4 +158,12 @@ public interface IOemStatementService extends BaseService<OemStatementEntity> {
      * @return
      */
     R generateSettlementByMjMes();
+
+    /**
+     * 自定义条件生成旧MES结算数据
+     *
+     * @param mesOemStatement
+     * @return
+     */
+    R generateSettlementByMjMes(StatementQuery mesOemStatement);
 }

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

@@ -2655,9 +2655,14 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
 
     @Override
     public R generateSettlementByMjMes() {
+        return this.generateSettlementByMjMes(new StatementQuery());
+    }
+
+    @Override
+    public R generateSettlementByMjMes(StatementQuery statementQuery) {
         List<OemStatementEntity> saves = new ArrayList<>();
         // 查询未生成的结算数据
-        List<StatementVO> statementVOS = baseMapper.selectUnsettledByMjMes(new StatementQuery());
+        List<StatementVO> statementVOS = baseMapper.selectUnsettledByMjMes(statementQuery);
         if (CollectionUtils.isEmpty(statementVOS)) {
             return R.fail("没有需要结算的记录");
         }