diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index 0acc86ebc..15043b5e1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -75,4 +75,11 @@ public interface EmisWaybillMapper extends BaseMapper public List selectEmisWaybillByMutiBillCode(String[] billCodes); + + + // 改变状态 + public int changeWaybillStatusByBillCode(EmisWaybill emisWaybill); + public int changeOrderStatusByBillCode(EmisWaybill emisWaybill); + public int changeOrderStatusByOrderSn(EmisWaybill emisWaybill); + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 020c6b28d..8faff5acf 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -108,6 +108,13 @@ public class EmisBaseService { return emisWaybillMapper.selectEmisWaybillByBillCode(billCode); } + public int changeWaybillStatus(String billCode,String waybillStatus){ + EmisWaybill emisWaybill = new EmisWaybill(); + emisWaybill.setBillCode(billCode); + emisWaybill.setWaybillStatus(waybillStatus); + return emisWaybillMapper.changeWaybillStatusByBillCode(emisWaybill); + } + public EmisRegion getRegionByName(String name,Integer regionType ){ EmisRegion queryRegion = new EmisRegion(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index b7d0de282..882cba933 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -235,6 +235,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm emisTmsScanRecord.preInsert(); emisTmsScanRecordMapper.insertEmisTmsScanRecord(emisTmsScanRecord); + // 修改运单状态 + changeWaybillStatus(billCode,scanType); + scanResultItem.setResult("success"); scanResultItem.setMessage("操作成功"); itemList.add(scanResultItem); diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 5f6b85168..52a8360b1 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -859,6 +859,19 @@ where id = #{id} + + + update emis_waybill set waybill_status=#{waybillStatus} where bill_code=#{billCode} + + + + update emis_waybill set order_status=#{orderStatus} where bill_code=#{billCode} + + + + update emis_waybill set order_status=#{orderStatus} where order_sn=#{orderSn} + + update emis_waybill set del_flag='1' where id = #{id}