bugFix 解决 待加工料卷批次号有多余逗号的问题

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

@@ -67,7 +67,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
      * @param batchNumn
      */
     public void updateBachmaterialprocessByIds(List<String> ids, String batchNumn) {
-        apsProcessOperationProcessEquDao.updateBachmaterialprocessByIds(ids, batchNumn);
+        if(StringUtils.isNotBlank(batchNumn)){
+            apsProcessOperationProcessEquDao.updateBachmaterialprocessByIds(ids, batchNumn);
+        }
     }
 
     /**

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

@@ -12,6 +12,7 @@ import com.rongwei.bsentity.vo.*;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
+import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import com.rongwei.safecommon.fegin.CXAdminFeginClient;
 import com.rongwei.safecommon.utils.CXCommonUtils;
@@ -150,8 +151,11 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                 //查询所有同级工序
                 List<ApsProcessOperationDo> list = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getPreviousprocessid, apsProcessOperationDo.getPreviousprocessid()));
                 List<String> processIdList = list.stream().map(ApsProcessOperationDo::getId).collect(Collectors.toList());
-                //更新所有同级工序作业的明细，增加批次号
-                apsProcessOperationDao.updateBatchNumberByProcessList(recordsDo.getBatchnumber(), processIdList);
+                if(StringUtils.isNotBlank(recordsDo.getBatchnumber())){
+                    //更新所有同级工序作业的明细，增加批次号
+                    apsProcessOperationDao.updateBatchNumberByProcessList(recordsDo.getBatchnumber(), processIdList);
+                }
+
             }
         }
 

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationDao.xml

@@ -4,8 +4,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.ApsProcessOperationDao">
     <update id="updateBachmaterialprocessByIds">
-        update aps_process_operation set BACHMATERIALPROCESS = CONCAT_WS(',',BACHMATERIALPROCESS,#{batchNum}),
-                                     INPUTUNQUALIFIEDROLL = INPUTUNQUALIFIEDROLL +#{unqualifiedQuantity}
+
+        update aps_process_operation
+        <set>
+            <if test="batchNum != null and batchNum!=''">
+                BACHMATERIALPROCESS = CONCAT_WS(',',BACHMATERIALPROCESS,#{batchNum}),
+            </if>
+            INPUTUNQUALIFIEDROLL = INPUTUNQUALIFIEDROLL +#{unqualifiedQuantity}
+        </set>
         <where>
             ID in
             <foreach collection="ids" separator="," open="(" close=")" item="id">