销售订单-修改6

zouyu

2023-11-16 f2597f5b7a8da61748f3bcc972450d409de93c18

销售订单-修改6

 mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java

@@ -26,6 +26,7 @@
import com.chinaztt.mes.plan.entity.CustomerOrder;
import com.chinaztt.mes.plan.entity.MoTestStandardParam;
import com.chinaztt.mes.plan.service.*;
import com.chinaztt.mes.plan.vo.CustomerOrderVO1;
import com.chinaztt.mes.quality.dto.CustomOrderSyncDTO;
import com.chinaztt.mes.quality.entity.TestStandardParam;
import com.chinaztt.mes.quality.service.TestStandardParamService;
@@ -189,8 +190,8 @@
     */
    @ApiOperation(value = "修改客户订单表", notes = "修改客户订单表")
    @SysLog("修改客户订单表")
    @PutMapping
    public R updateById(@RequestBody CustomerOrderDTO customerOrderDTO) {
    @PutMapping("/updateById")
    public R updateById(@RequestBody CustomerOrderVO1 customerOrderDTO) {
        return customerOrderService.fullUpdate(customerOrderDTO);
    }


 mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java

@@ -66,7 +66,7 @@
     * @param customerOrderDTO
     * @return
     */
    R fullUpdate(CustomerOrderDTO customerOrderDTO);
    R fullUpdate(CustomerOrderVO1 customerOrderDTO);

    /**
     * 更新订单航说明

 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() + "】MES本地查无匹配零件对象");
                }
            }
            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() + "】MES本地查无匹配零件对象");
                }
            }
            // 如果销售零件号未修改，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