From f2597f5b7a8da61748f3bcc972450d409de93c18 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 16 十一月 2023 10:05:08 +0800
Subject: [PATCH] 销售订单-修改6
---
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java | 47 +++++++++++------------------------------------
1 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
index 04fa92d..3604baf 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
@@ -286,42 +286,17 @@
@Override
- public R fullUpdate(CustomerOrderDTO customerOrderDTO) {
- List<String> unitWhitMapList = customerOrderUnitWhiteListConfig.getUnitWhitListMap();
- String unitConcat = customerOrderDTO.getOtcUnit() + "_" + customerOrderDTO.getIfsSalesUnit();
- if (!customerOrderDTO.getOtcUnit().equals(customerOrderDTO.getIfsSalesUnit()) && !unitWhitMapList.contains(unitConcat)) {
- //濡傛灉閿�鍞崟浣嶅拰ifs涓攢鍞崟浣嶄笉涓�鏍峰垯涓嶇粰淇濆瓨A
- return R.failed("璁㈠崟琛岄攢鍞崟浣嶅拰閿�鍞欢閿�鍞閲忓崟浣嶄笉涓�鑷村苟涓旂櫧鍚嶅崟涓笉瀛樺湪瀵瑰簲鍏崇郴");
- } else {
- if (StringUtils.isNotBlank(customerOrderDTO.getPartNo())) {
- Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getPartNo()));
- if (null == part) {
- throw new RuntimeException("鏍规嵁闆朵欢缂栧彿 = 銆�" + customerOrderDTO.getPartNo() + "銆慚ES鏈湴鏌ユ棤鍖归厤闆朵欢瀵硅薄");
- }
- }
- if (StringUtils.isNotBlank(customerOrderDTO.getSalesPartNo())) {
- Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getSalesPartNo()));
- if (null == part) {
- throw new RuntimeException("鏍规嵁閿�鍞欢缂栧彿 = 銆�" + customerOrderDTO.getSalesPartNo() + "銆慚ES鏈湴鏌ユ棤鍖归厤闆朵欢瀵硅薄");
- }
- }
- // 濡傛灉閿�鍞浂浠跺彿鏈慨鏀癸紝otc鍚屾鐘舵�佷笉闇�瑕佹洿鏂�
- CustomerOrder oriCustomerOrder = customerOrderMapper.selectById(customerOrderDTO.getId());
- if (!org.apache.commons.lang3.StringUtils.equals(oriCustomerOrder.getSalesPartNo(),
- customerOrderDTO.getSalesPartNo())) {
- customerOrderDTO.setOtcPartSync(false);
- }
- //mes鏁伴噺 = 璁㈠崟鏁伴噺 * 鍥犲瓙
- Assert.notNull(customerOrderDTO.getIfsConvFactor(), "璇烽�夋嫨閿�鍞浂浠跺彿");
- customerOrderDTO.setBuyQtyDue(customerOrderDTO.getIfsConvFactor().multiply(customerOrderDTO.getOtcQuantity()));
- if (BooleanUtil.isTrue(customerOrderDTO.getIsDocument())) {
- customerOrderDTO.setCoState(CustomerOrderStateStringValues.PLAN);
- } else {
- customerOrderDTO.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
- }
- updateById(customerOrderDTO);
- return R.ok();
- }
+ public R fullUpdate(CustomerOrderVO1 customerOrderVO1) {
+ CustomerOrder customerOrder = new CustomerOrder();
+ BeanUtils.copyProperties(customerOrderVO1,customerOrder);
+ customerOrder.setId(customerOrderVO1.getId());
+ customerOrderMapper.updateById(customerOrder);
+
+ Customer customer = new Customer();
+ BeanUtils.copyProperties(customerOrderVO1,customer);
+ customer.setId(customerOrderMapper.selectById(customerOrderVO1.getId()).getCustomerId());
+ customerMapper.updateById(customer);
+ return R.ok("淇敼鎴愬姛!");
}
@Override
--
Gitblit v1.9.3