立库完成入库添加库区信息

skyouc

1 天以前 3aed7236f2db67dd90115a39bc8f1465e4cc8b73

 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java

@@ -2,7 +2,6 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.entity.OrderParams;
@@ -10,7 +9,6 @@
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.enums.MatLocType;
import com.zy.api.enums.MatType;
import com.zy.api.enums.OrderType;
import com.zy.api.enums.OrderWkType;
import com.zy.api.service.KopenApiService;
@@ -62,6 +60,7 @@

    /**
     * 上架派工单反馈
     * 
     * @author Ryan
     * @date 2025/11/24 15:33
     */
@@ -95,14 +94,15 @@
        }
    }

     /* */
     /**
      * 备货指示派工单下发
      * @author Ryan
      * @date 2025/11/24 15:21
      * @param params
      * @return com.core.common.R
      */
    /* */
    /**
     * 备货指示派工单下发
     * 
     * @author Ryan
     * @date 2025/11/24 15:21
     * @param params
     * @return com.core.common.R
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R sendOutDispatch(PubOrderParams params) {
@@ -121,12 +121,13 @@
        }

        addOrUpdateOrders(params, "add");
        

        return R.ok("备货指示派工单下发成功！！");
    }

    /**
     * 备货指示派工单
     * 
     * @author Ryan
     * @date 2025/12/16 9:15
     * @param params
@@ -153,7 +154,8 @@
            // 删除旧订单明细
            if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
                throw new CoolException("订单明细删除失败！！");
            };
            }
            ;
            if (!orderService.deleteById(order.getId())) {
                throw new CoolException("原单据删除失败！！");
            }
@@ -231,7 +233,14 @@
            throw new CoolException("订单类型不能为空！！");
        }
        OrderParams orderParams = JSONObject.parseObject(JSONObject.toJSONString(params), OrderParams.class);
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getInv_no()));
        Order order = new Order();
        if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
            // 入库
          order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getInv_no()));
        } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
            // 出库
           order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getDispatch_no()));
        }
        if (type.equals("add") && !Objects.isNull(order)) {
            throw new CoolException("单据已存在, 不可重复添加！！");
        }
@@ -256,10 +265,10 @@
    public static String generateUUID(OrderParams params) {
        return java.util.UUID.randomUUID().toString();
    }
    

    /**
     * 生成订单信息
     * 
     * @param params
     */
    @Transactional(rollbackFor = Exception.class)
@@ -321,7 +330,7 @@
                orderItem.setBrand(matnr.getBrand());
                orderItem.setBatch(1 + "");
                orderItem.setStandby1(item.getPro_id());
                //关联上加派工单号+零件代码+供应商代码
                // 关联上加派工单号+零件代码+供应商代码
                orderItem.setThreeCode(item.getTotal_serial());
                // 供应商代码
                orderItem.setSuppCode(item.getPro_id());