|
|
@@ -211,13 +211,13 @@ public class ERPServiceImpl implements ERPService {
|
|
|
return retMap;
|
|
|
}
|
|
|
SqlRowList docLoist = baseDao.queryForRowSet(
|
|
|
- " 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_zxbzs 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) " +
|
|
|
- " order by min(cd_detno) ",id);
|
|
|
+ " ) order by ztcnno ",id);
|
|
|
if(!docLoist.hasNext()){
|
|
|
// System.out.println("no docLoist!");
|
|
|
retMap.put("success",false);
|
|
|
@@ -300,7 +300,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
" and nvl(cd_wflag,' ') = '"+StringUtil.nvl(zwidth," ")+"'" +
|
|
|
" and nvl(cd_lotno,' ') = '"+StringUtil.nvl(zzstz," ")+"'" +
|
|
|
" and cd_newboxcode||(case when cd_remark is not null then ' '||cd_remark else '' end) = '"+StringUtil.nvl(zremark," ")+"'" +
|
|
|
- " order by cd_detno");
|
|
|
+ " order by cd_dc,cd_detno");
|
|
|
if(panIdList.size() != updateList.getResultList().size()){
|
|
|
errMsg.append("条码创建数与实际不一致，型号:"+matnr).append("创建数:"+panIdList.size()+",待更新数量:"+updateList.getResultList().size()).append("</br>");
|
|
|
continue;
|
|
|
@@ -418,6 +418,8 @@ public class ERPServiceImpl implements ERPService {
|
|
|
paraMap.put("zbzsmount",docMap.get("zbzsmount"));//包装袋容量
|
|
|
paraMap.put("zremark",zremark);//备注
|
|
|
paraMap.put("partner",vendcode);//供应商编码 固定值
|
|
|
+ logger.info("createSticker-begin: zremark {} matnr {} zmount {} zzbsmount {} zzxsmount {} zbzsmount {}"
|
|
|
+ , zremark,matnr,docMap.get("zmount"),docMap.get("zzbsmount"),docMap.get("zzxsmount"),docMap.get("zbzsmount"));
|
|
|
HttpUtil.Response response = HttpUtil.doPost(url+action, JacksonUtil.toJson(paraMap), deipaaskeyauth,deipaasjwt);
|
|
|
if (response.getStatusCode() == HttpStatus.OK.value()){
|
|
|
String res = response.getResponseText();
|
|
|
@@ -426,7 +428,8 @@ public class ERPServiceImpl implements ERPService {
|
|
|
Map<String,Object> resData = JacksonUtil.fromJson(res);
|
|
|
if("S".equals(String.valueOf(resData.get("e_type")))){
|
|
|
List<Map<String,Object>> outdata = (List) resData.get("outdata");
|
|
|
-// System.out.println("outdata.size:"+outdata.size());
|
|
|
+ System.out.println("outdata.size:"+outdata.size());
|
|
|
+ logger.info("outdata.size {}", outdata.size());
|
|
|
for (Map<String,Object> odMap: outdata) {
|
|
|
List<String> odsqls = new ArrayList<>();
|
|
|
odsqls.add("insert into CATLDOC_OUTDATA(CDO_ID, CDO_CAID, CDO_DOCDATE,CDO_CDIDS" +
|
