diff --git a/src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java b/src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java index b417cd53..0c6d36c6 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java +++ b/src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java @@ -67,8 +67,8 @@ public class CoDelController { } @PostMapping("/saveEcssCoDelNotifyByExcel") - public R saveEcssCoDelNotifyByExcel(@RequestParam(value = "file") MultipartFile file, - @ModelAttribute EcssCoDelNotifyHeaderData data, + public R saveEcssCoDelNotifyByExcel(@RequestParam(value = "file") MultipartFile file, + @ModelAttribute EcssCoDelNotifyHeaderData data, @RequestParam(value = "deletedInvoices", required = false) String deletedInvoices, HttpServletRequest request){ Map> resultMap = coDelService.saveEcssCoDelNotifyByExcel(file, data, deletedInvoices, request); @@ -277,6 +277,12 @@ public class CoDelController { return R.ok(); } + @PostMapping("/updateCodelPalletHeaderPalletQty") + public R updateCodelPalletHeaderPalletQty(@RequestBody EcssCoDelPalletHeaderData inData){ + coDelService.updateCodelPalletHeaderPalletQty(inData); + return R.ok(); + } + @PostMapping("/deletePalletHeader") public R deletePalletHeader(@RequestBody EcssCoDelPalletHeaderData inData){ coDelService.deletePalletHeader(inData); diff --git a/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java b/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java index 8d5397c0..6f6df54a 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java +++ b/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java @@ -112,6 +112,7 @@ public interface CoDelMapper { int getCoDelPalletDetailItem(EcssCoDelPalletDetail inData); void updateCodelPalletHeader(EcssCoDelPalletHeaderData inData); void updateCodelPalletHeader2(EcssCoDelPalletData inData); + void updateCodelPalletHeaderPalletQty(EcssCoDelPalletHeaderData inData); void updateCodelPalletDetail(EcssCoDelPalletDetail inData); void deletePalletHeader(EcssCoDelPalletHeaderData inData); void deleteBoxList(EcssCoDelPalletHeaderData inData); diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java b/src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java index d7ce0692..ea872678 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java @@ -79,6 +79,8 @@ public interface CoDelService { void savePalletHeader(EcssCoDelPalletHeaderData inData); + void updateCodelPalletHeaderPalletQty(EcssCoDelPalletHeaderData inData); + void deletePalletHeader(EcssCoDelPalletHeaderData inData); void savePalletDetail(EcssCoDelPalletData inData); diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index a88ce23b..cdac5e61 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -1211,6 +1211,10 @@ public class CoDelServiceImpl implements CoDelService { } } + public void updateCodelPalletHeaderPalletQty(EcssCoDelPalletHeaderData inData) { + coDelMapper.updateCodelPalletHeaderPalletQty(inData); + } + @Override public void deletePalletHeader(EcssCoDelPalletHeaderData inData) { coDelMapper.deletePalletHeader(inData); diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index 4d58a7bf..dd65579c 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -495,6 +495,11 @@ create_by,create_date,update_by,update_date update_by=#{updateBy},update_date=GetDate() where site =#{site} and bu_no=#{buNo} and delNo=#{delNo} and seq_no=#{seqNo} + + update ecss_CoDelPalletHeader set pallet_qty=#{palletQty,jdbcType=INTEGER},height=#{height,jdbcType=DECIMAL}, + update_by=#{updateBy},update_date=GetDate() + where site =#{site} and bu_no=#{buNo} and delNo=#{delNo} and seq_no=#{seqNo} + update ecss_CoDelPalletDetail set part_no=#{partNo},qty=#{qty,jdbcType=DECIMAL},po_no=#{poNo}, box_qty=#{boxQty,jdbcType=DECIMAL},update_by=#{updateBy},update_date=GetDate(),rolls=#{rolls},pn=#{pn}