diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java index d751827..b35924c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java @@ -9,7 +9,7 @@ import com.glxp.sale.admin.req.inout.StockOrderPostRequest; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService; import com.glxp.sale.admin.service.thrsys.ThrOrderService; -import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.admin.util.*; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -33,6 +33,8 @@ public class ThrOrderReceiveController { private ThrOrderDetailService thrOrderDetailService; @Resource CustomerService customerService; + @Resource + GennerOrderUtils gennerOrderUtils; @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/order/insertWeb") @@ -43,17 +45,17 @@ public class ThrOrderReceiveController { } Integer userId = customerService.getUserId(); ThrOrderEntity stockOrderEntity = new ThrOrderEntity(); -// Integer id = Integer.parseInt(CustomUtil.getId()); BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity); stockOrderEntity.setCreateUser(userId + ""); stockOrderEntity.setType(1);//领用单据 stockOrderEntity.setUpdateTime(new Date()); stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); -// stockOrderEntity.setId(id); ThrOrderEntity temp = thrOrderService.findByUnique(stockOrderEntity.getBillNo(), stockOrderEntity.getThirdSysFk()); if (temp != null) { stockOrderEntity.setId(temp.getId()); } + String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); + stockOrderEntity.setBillNo(orderNo); thrOrderService.insertThrOrder(stockOrderEntity); stockOrderEntity = thrOrderService.findByUnique(stockOrderEntity.getBillNo(), stockOrderEntity.getThirdSysFk()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java b/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java index f684d67..26b8539 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java @@ -20,6 +20,7 @@ public class Constant { public static final String SCAN_ORDER = "ZS"; public static final String BUS_ORDER = "ZY"; + public static final String LIN_YONG = "ZL"; public static String SPTM_TO_DI = "sptm_to_di"; public static String DELAY_SYNC_TIME = "DELAY_SYNC_TIME";