【英唐-CATL条码对接】【箱、袋备注更新】

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -396,7 +396,7 @@ public class ERPServiceImpl implements ERPService {
         SqlRowList docList = baseDao.queryForRowSet("SELECT * FROM ( " +
                 "    select cd_cpn,min(CD_DC) ztcnno,pc_zbzsmount_user zzbsmount,pc_zzxsmount_user zzxsmount,pc_zzbsmount_user zbzsmount ,cd_newboxcode " +
                 "        ,sum(CD_QTY) zmount,cd_wflag zwidth,ca_code||'_'||cd_newboxcode zzstz " +
-                "        ,cd_newboxcode||' '||to_char(wm_concat(cd_remark)) zremark,sum(codecount) codecount,wm_concat(cd_id) cd_ids " +
+                "        ,cd_newboxcode||' '||to_char(min(cd_remark)) zremark,sum(codecount) codecount,wm_concat(cd_id) cd_ids " +
                 "    from( " +
                 "        select min(cd_detno) cd_detno,CD_CPN,pc_zbzsmount_user,pc_zzxsmount_user,pc_zzbsmount_user,cd_wflag,cd_remark,cd_newboxcode,ca_code " +
                 "            ,sum(CD_QTY) CD_QTY,min(CD_DC) CD_DC,count(1) codecount,to_char(wm_concat(cd_id)) cd_id " +
@@ -503,7 +503,7 @@ public class ERPServiceImpl implements ERPService {
                             String zeiar = StringUtil.nvl(outdata.get(0).get("zeiar"),"");
                             //更新箱ID、袋ID
                             List<String> sqls = new ArrayList<>();
-                            SqlRowList updateList = baseDao.queryForRowSet("select cd_id,cd_lotno,cd_dc,nvl(cd_ed,to_char(to_date(cd_dc,'yyyymmdd')+365,'yyyymmdd')) cd_ed from CatlDocDetail " +
+                            SqlRowList updateList = baseDao.queryForRowSet("select cd_id,cd_lotno,cd_dc,nvl(cd_ed,to_char(to_date(cd_dc,'yyyymmdd')+365,'yyyymmdd')) cd_ed,cd_remark from CatlDocDetail " +
                                     " where cd_caid = "+id+" and CD_PANID is null and CD_id in ("+cd_ids+") order by cd_detno");
                             List<Map<String,Object>> updateStickerList = new ArrayList<>();
                             Map<String,Map<String,Object>> updateBoxStickers = new HashMap<>();
@@ -532,6 +532,7 @@ public class ERPServiceImpl implements ERPService {
                                         updatePanMap.put("prtbatchid",updateMap.get("cd_lotno"));//供应商批次
                                         updatePanMap.put("manufacturing_date",updateMap.get("cd_dc"));//生产日期
                                         updatePanMap.put("atlyx",updateMap.get("cd_ed"));//有效日期
+                                        updatePanMap.put("zremark",updateMap.get("cd_remark"));//备注
                                         updateStickerList.add(updatePanMap);
                                         Map<String,Object> updateBoxMap = new HashMap<>();
                                         if(docMap.get("zzxsmount").equals(docMap.get("zbzsmount"))){//箱容量 = 盘容量 一起更
@@ -540,6 +541,7 @@ public class ERPServiceImpl implements ERPService {
                                             updateBoxMap.put("prtbatchid",updateMap.get("cd_lotno"));//供应商批次
                                             updateBoxMap.put("manufacturing_date",updateMap.get("cd_dc"));//生产日期
                                             updateBoxMap.put("atlyx",updateMap.get("cd_ed"));//有效日期
+                                            updateBoxMap.put("zremark",updateMap.get("cd_remark"));//备注
                                             updateStickerList.add(updateBoxMap);
                                         }else {
                                             if(!updateBoxStickers.containsKey(boxId)) {
@@ -548,6 +550,7 @@ public class ERPServiceImpl implements ERPService {
                                                 updateBoxMap.put("prtbatchid",updateMap.get("cd_lotno"));//供应商批次
                                                 updateBoxMap.put("manufacturing_date",updateMap.get("cd_dc"));//生产日期
                                                 updateBoxMap.put("atlyx",updateMap.get("cd_ed"));//有效日期
+                                                updateBoxMap.put("zremark",updateMap.get("cd_remark"));//备注
                                                 updateBoxStickers.put(boxId,updateBoxMap);
                                             }else{
                                                 updateBoxMap = updateBoxStickers.get(boxId);
@@ -555,6 +558,7 @@ public class ERPServiceImpl implements ERPService {
                                                     updateBoxMap.put("prtbatchid",updateMap.get("cd_lotno"));//供应商批次
                                                     updateBoxMap.put("manufacturing_date",updateMap.get("cd_dc"));//生产日期
                                                     updateBoxMap.put("atlyx",updateMap.get("cd_ed"));//有效日期
+                                                    updateBoxMap.put("zremark",updateMap.get("cd_remark"));//备注
                                                     updateBoxStickers.put(boxId,updateBoxMap);
                                                 }
                                             }