diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index d69e642c5..3210a0d91 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -808,7 +808,7 @@ public class PickingOrderApplicationService { // etpsPreentNo: 入库单号 - 取拣货明细中的入库单号(第一个) String inOrderNumber = outMaterialDetailList.get(0).getInOrderNumber(); order.put("etpsPreentNo", inOrderNumber != null ? inOrderNumber : ""); - order.put("inputTime", new Date()); + order.put("inputTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); order.put("mtpckEndprdTypecd", "E"); // 成品(出口) order.put("stockTypecd", "I"); diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 09dcc8f3e..cd290cd7f 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -148,6 +148,9 @@ and a.notice_number = #{noticeNumber} + + and a.need_declare_flag = #{needDeclareFlag} + and a.out_order_number like concat('%', #{outOrderNumber}, '%')