aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-05 08:21:00 +08:00
parent eea8b78bbe
commit 4f43cc748f
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
View File

@ -132,11 +132,11 @@ public class EmisWarehouseInBatchServiceImpl extends EmisBaseService implements
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment); emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);
// 更新商品图片信息 // 更新商品图片信息
String goodsPics = waybill.getGoodsPics()+","+emisWarehouseInBatch.getPicUrl(); // String goodsPics = waybill.getGoodsPics()+","+emisWarehouseInBatch.getPicUrl();
EmisWaybill waybillOld = new EmisWaybill(); // EmisWaybill waybillOld = new EmisWaybill();
waybillOld.setId(waybill.getId()); // waybillOld.setId(waybill.getId());
waybillOld.setGoodsPics(goodsPics); // waybillOld.setGoodsPics(goodsPics);
emisWaybillMapper.updateEmisWaybill(waybillOld); // emisWaybillMapper.updateEmisWaybill(waybillOld);
} }
} }

14
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -338,9 +338,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
goodsImgBmk=StringUtils.removeEnd(goodsImgBmk, ","); goodsImgBmk=StringUtils.removeEnd(goodsImgBmk, ",");
gotImgBmk=StringUtils.removeEnd(gotImgBmk, ","); gotImgBmk=StringUtils.removeEnd(gotImgBmk, ",");
// 返回图片
dbEmisWaybill.setGoodsPics(goodsImgBmk);
// private String billPicSendRmk; // private String billPicSendRmk;
// /* 签收底单图片 */ // /* 签收底单图片 */
// private String billPicDispatchRmk; // private String billPicDispatchRmk;
dbEmisWaybill.setBillPicGoodsRmk(goodsImgBmk); dbEmisWaybill.setBillPicGoodsRmk(goodsImgBmk);
dbEmisWaybill.setBillPicDispatchRmk(signImgBmk); dbEmisWaybill.setBillPicDispatchRmk(signImgBmk);
dbEmisWaybill.setBillPicSendRmk(gotImgBmk); dbEmisWaybill.setBillPicSendRmk(gotImgBmk);
@ -2789,6 +2793,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 公共计算部分 // 公共计算部分
calcWayBillCommonInfo(emisWaybillSave,null,true); calcWayBillCommonInfo(emisWaybillSave,null,true);
String goodsPicsStr=emisWaybillSave.getGoodsPics();
if(!StringUtils.isEmpty(goodsPicsStr)) {
emisWaybillSave.setGoodsPics("1");
}
//补齐数据 //补齐数据
emisWaybillMapper.insertEmisWaybill(emisWaybillSave); emisWaybillMapper.insertEmisWaybill(emisWaybillSave);
@ -2803,7 +2812,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
bindSalesmen(bindEmpCode,customerCode); bindSalesmen(bindEmpCode,customerCode);
} }
// 扣减子单 // 扣减子单
emisElectronicSitePagService.realMatchSubBill(emisWaybillSave.getSendSiteCode(),"T7080",emisWaybillSave.getParcelQty()); emisElectronicSitePagService.realMatchSubBill(emisWaybillSave.getSendSiteCode(),"T7080",emisWaybillSave.getParcelQty());
@ -2827,7 +2835,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
// 保存货物图片 // 保存货物图片
if(!StringUtils.isEmpty(emisWaybillSave.getGoodsPics())){ if(!StringUtils.isEmpty(goodsPicsStr)){
// 删除历史图片，重新插入图片 // 删除历史图片，重新插入图片
emisWaybillAttachmentMapper.deleteByBillCodeAndAttachType(emisWaybillSave.getBillCode(),WaybillAttachType.GOODS_PIC.typeCode); emisWaybillAttachmentMapper.deleteByBillCodeAndAttachType(emisWaybillSave.getBillCode(),WaybillAttachType.GOODS_PIC.typeCode);
@ -2835,7 +2843,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
EmisWaybillAttachment goodsPicAttachment = new EmisWaybillAttachment(); EmisWaybillAttachment goodsPicAttachment = new EmisWaybillAttachment();
goodsPicAttachment.setAttachType(WaybillAttachType.GOODS_PIC.typeCode); goodsPicAttachment.setAttachType(WaybillAttachType.GOODS_PIC.typeCode);
goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode()); goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode());
goodsPicAttachment.setFileUrl(emisWaybillSave.getGoodsPics()); goodsPicAttachment.setFileUrl(goodsPicsStr);
goodsPicAttachment.setWaybillId(emisWaybillSave.getId()); goodsPicAttachment.setWaybillId(emisWaybillSave.getId());
goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode()); goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode());
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment); emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);