【英唐-CATL条码对接】【新增CATL中盒容量（纸箱容量）】

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

@@ -33,11 +33,11 @@ public class ERPServiceImpl implements ERPService {
         retMap.put("success",true);
         logger.info("createSticker-Begin:master {} id {}",master,id);
         SpObserver.putSp(master);
-        SqlRowList docLoist = baseDao.queryForRowSet("select cd_cpn,min(CD_DC) ztcnno,pr_capacity zzbsmount,pr_zxbzs zzxsmount,pr_zxbzs zbzsmount" +
+        SqlRowList docLoist = baseDao.queryForRowSet("select cd_cpn,min(CD_DC) ztcnno,pr_capacity zzbsmount,pr_pcapacity_user zzxsmount,pr_zxbzs zbzsmount" +
                 " ,sum(CD_QTY) zmount,cd_wflag zwidth,cd_remark zremark,min(cd_lotno) zzstz " +
                 "from CatlDocDetail left join product on pr_code = CD_PRCODE " +
                 "where cd_caid = ? and CD_PANID is null and nvl(pr_capacity,0)>0 " +
-                "group by CD_CPN,pr_capacity,pr_zxbzs,cd_wflag,cd_remark order by min(cd_detno)",id);
+                "group by CD_CPN,pr_capacity,pr_pcapacity_user,pr_zxbzs,cd_wflag,cd_remark order by min(cd_detno)",id);
         if(!docLoist.hasNext()){
 //            System.out.println("no docLoist!");
             retMap.put("success",false);
@@ -226,12 +226,12 @@ public class ERPServiceImpl implements ERPService {
         //创建中
         baseDao.execute("update CatlDoc set ca_docstate=2 where ca_id = "+id);
         SqlRowList docLoist = baseDao.queryForRowSet(
-                "SELECT * FROM ( select CD_CPN matnr,CD_DC ztcnno,pr_capacity zzbsmount,pr_zxbzs zzxsmount,pr_zxbzs zbzsmount " +
+                "SELECT * FROM ( select CD_CPN matnr,CD_DC ztcnno,pr_capacity zzbsmount,pr_pcapacity_user zzxsmount,pr_zxbzs zbzsmount " +
                         "  ,sum(CD_QTY) zmount,cd_wflag zwidth,cd_lotno zzstz " +
                         ",cd_newboxcode||(case when cd_remark is not null then ' '||cd_remark else '' end) zremark,count(1) codecount " +
                 " from CatlDocDetail left join product on pr_code = CD_PRCODE " +
                 " where cd_caid = ? and CD_PANID is null and nvl(pr_capacity,0)>0 " +
-                " group by CD_CPN,CD_DC,pr_capacity,pr_zxbzs,cd_lotno,cd_wflag,cd_newboxcode||(case when cd_remark is not null then ' '||cd_remark else '' end)   " +
+                " group by CD_CPN,CD_DC,pr_capacity,pr_pcapacity_user,pr_zxbzs,cd_lotno,cd_wflag,cd_newboxcode||(case when cd_remark is not null then ' '||cd_remark else '' end)   " +
                 " ) order by ztcnno,zremark ",id);
         if(!docLoist.hasNext()){
 //            System.out.println("no docLoist!");
@@ -385,13 +385,13 @@ public class ERPServiceImpl implements ERPService {
         //创建中
         baseDao.execute("update CatlDoc set CA_DOCSTATE=2 where ca_id = "+id);
         SqlRowList docList = baseDao.queryForRowSet("SELECT * FROM ( " +
-                "select cd_cpn,min(CD_DC) ztcnno,pr_capacity zzbsmount,pr_zxbzs zzxsmount,pr_zxbzs zbzsmount ,cd_newboxcode " +
+                "select cd_cpn,min(CD_DC) ztcnno,pr_capacity zzbsmount,pr_pcapacity_user zzxsmount,pr_zxbzs zbzsmount ,cd_newboxcode " +
                 "  ,sum(CD_QTY) zmount,cd_wflag zwidth,ca_code||'_'||cd_newboxcode zzstz " +
                 "  ,cd_newboxcode||(case when cd_remark is not null then ' '||cd_remark else '' end) zremark,count(1) codecount,wm_concat(cd_id) cd_ids  " +
                 "from CatlDocDetail left join product on pr_code = CD_PRCODE left join CatlDoc on ca_id = cd_caid " +
                 "where cd_caid = ? and nvl(pr_capacity,0)>0 " +
                 " and CD_PANID is null "+
-                " group by CD_CPN,pr_capacity,pr_zxbzs,cd_wflag,cd_remark,cd_newboxcode,ca_code||'_'||cd_newboxcode order by min(cd_detno)" +
+                " group by CD_CPN,pr_capacity,pr_pcapacity_user,pr_zxbzs,d_wflag,cd_remark,cd_newboxcode,ca_code||'_'||cd_newboxcode order by min(cd_detno)" +
                 " ) order by to_number(cd_newboxcode)",id);
         if(!docList.hasNext()){
             retMap.put("success",false);