Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationProcessEquDao.java

@@ -57,7 +57,7 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
     @Select("select PRODUCTIONORDERID AS 'orderId',MIN(PRODUCTSTATUS) AS 'minProductionStatus',MAX(PRODUCTSTATUS) AS 'maxProductionStatus' from aps_blank_order where DELETED = 0 AND PRODUCTIONORDERID = (select PRODUCTIONORDERID from aps_blank_order where ID = #{blankId}) GROUP BY PRODUCTIONORDERID")
     CommonUpdateProductionStatusReq selectBlankMinAndMaxStatus(@Param("blankId") String blankId);
 
-    @Update("update aps_process_operation_process_equ set STARTINGROLL = STARTINGROLL - 1,WAITREPORTID = null where ID = #{processequid}")
+    @Update("update aps_process_operation_process_equ set STARTINGROLL = STARTINGROLL - 1,WAITREPORTID = null,DOINGBATCHNUMBER = '' where ID = #{processequid}")
     void updateByCancelRecord(@Param("processequid") String processequid);
 
     @Update("update asp_check_items set WAITREPORTID = null where ID = #{deviceId}")

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -9,6 +9,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.rongwei.bscommon.sys.dao.*;
@@ -2031,6 +2032,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         //物理删除相关的作业明细备份
         this.baseMapper.deleteProcessEquBackupByBlankId(req.getId());
 
+        //如果是否备料=是，备料对应在制品的备料计划ID=(空)，在制品状态=备料中
+        if (apsBlankOrderDo.getPreparematerial().equals("是")) {
+            apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
+                    .set(ApsWorkInProgressInventoryDo::getBlankid, "")
+                    .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, SaveConstans.WorkInProgressStatus.WAITING)
+                    .eq(ApsWorkInProgressInventoryDo::getBlankid, req.getId()));
+        }
+
         //查询此订单的其他任一一个坯料计划的Id，重新更新订单的状态
         CommonUpdateProductionStatusReq commonUpdateProductionStatusReq = new CommonUpdateProductionStatusReq();
         List<ApsBlankOrderDo> list = this.list(new QueryWrapper<ApsBlankOrderDo>().lambda().eq(ApsBlankOrderDo::getProductionorderid, apsBlankOrderDo.getProductionorderid()));

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -110,7 +110,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         //工序作业明细ID
         String processequid = recordsDo.getProcessequid();
 
-        //更新该工序作业的作业明细的作业状态字段、已开工卷数、明细的待报工记录ID=（空）
+        //更新该工序作业的作业明细的作业状态字段、已开工卷数、明细的待报工记录ID=（空），加工中批次号=(空)
         apsProcessOperationProcessEquDao.updateByCancelRecord(processequid);
 
         //更新该工序作业的已开工卷数-1
@@ -259,6 +259,9 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             //更新实际开工时间
             needUpdateProcessOperationProcessEqu.setActualstartdate(DateUtil.date());
         }
+        if (ObjectUtil.isNotEmpty(req.getInputBatchNumber())) {
+            needUpdateProcessOperationProcessEqu.setDoingbatchnumber(req.getInputBatchNumber());
+        }
         apsProcessOperationProcessEquService.updateById(needUpdateProcessOperationProcessEqu);
 
         //===============更新工序作业==================
@@ -482,6 +485,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         if (apsProcessOperationProcessEquDo.getClosestatus().equals("未完工") && apsProcessOperationProcessEquDo.getStartingroll() > 0) {
             needUpdateProcessOperationProcessEquDo.setWorkstatus("加工中");
         }
+        //清空加工中批次号
+        needUpdateProcessOperationProcessEquDo.setDoingbatchnumber("");
         apsProcessOperationProcessEquService.updateById(needUpdateProcessOperationProcessEquDo);
 
         //==============更新工序作业信息==============
@@ -542,7 +547,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         //查询新的输出物料
         List<ApsReportOutputDo> newOutputDos = apsReportOutputService.list(new QueryWrapper<ApsReportOutputDo>().lambda().eq(ApsReportOutputDo::getMainid, apsReportRecordsDo.getId()));
         //填补对应的检验等级和是否合格
-        if(apsReportOutputDoList.size() == newOutputDos.size()){
+        if (apsReportOutputDoList.size() == newOutputDos.size()) {
             for (int i = 0; i < newOutputDos.size(); i++) {
                 newOutputDos.get(i).setInsepctionlevel(apsReportOutputDoList.get(i).getInsepctionlevel());
                 newOutputDos.get(i).setQualified(apsReportOutputDoList.get(i).getQualified());

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsBlankOrderDo.java

@@ -185,6 +185,12 @@ public class ApsBlankOrderDo extends BaseDo {
     @TableField("SCHEDULINGSTATUS")
     private String schedulingstatus;
 
+    /**
+     * 预计来料日期
+     */
+    @TableField(value = "PLANHAVEMATERIALDATE")
+    private Date planhavematerialdate;
+
     /**
      * 期望交货日期
      */
@@ -237,4 +243,57 @@ public class ApsBlankOrderDo extends BaseDo {
      */
     @TableField("PLANNEDPRODUCTIONWORKSHOP")
     private String plannedproductionworkshop;
+    /**
+     * 路线产品类型
+     */
+    @TableField(value = "ROUTEPRODUCTTYPEID")
+    private String routeproducttypeid;
+
+    /**
+     * 路线合金
+     */
+    @TableField(value = "ROUTEMETAL")
+    private String routemetal;
+
+    /**
+     * 路线合金状态
+     */
+    @TableField(value = "ROUTEMETALSTATE")
+    private String routemetalstate;
+
+    /**
+     * 路线厚度-起（mm）
+     */
+    @TableField(value = "ROUTETHICKSTR")
+    private BigDecimal routethinckstr;
+
+    /**
+     * 路线厚度-止（mm）
+     */
+    @TableField(value = "ROUTETHICKEND")
+    private BigDecimal routethickend;
+
+    /**
+     * 路线宽度-起（mm）
+     */
+    @TableField(value = "ROUTEWIDTHSTR")
+    private BigDecimal routewodthstr;
+
+    /**
+     * 路线宽度-止（mm）
+     */
+    @TableField(value = "ROUTEWIDTHEND")
+    private BigDecimal routewidthend;
+
+    /**
+     * 路线长度-起（mm）
+     */
+    @TableField(value = "ROUTELENGTHSTR")
+    private BigDecimal routelengthstr;
+
+    /**
+     * 路线长度-止（mm）
+     */
+    @TableField(value = "ROUTELENGTHEND")
+    private BigDecimal routelengthend;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationProcessEquBackupDo.java

@@ -148,4 +148,9 @@ public class ApsProcessOperationProcessEquBackupDo extends BaseDo implements Ser
      * 后道工序ID
      */
     private String nextprocessesids;
+    /**
+     * 加工中批次号
+     */
+    @TableField("DOINGBATCHNUMBER")
+    private String doingbatchnumber;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationProcessEquDo.java

@@ -167,4 +167,9 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
      * 后道工序ID
      */
     private String nextprocessesids;
+    /**
+     * 加工中批次号
+     */
+    @TableField("DOINGBATCHNUMBER")
+    private String doingbatchnumber;
 }