Merge remote-tracking branch 'origin/tzglasrs' into tzglasrs

lty

2025-05-21 2d68b0241edf83823bedba2392b81c9f0957a7d3

 src/main/java/com/zy/third/erp/task/ERPInOrOutService.java

@@ -51,7 +51,7 @@
    /**
     * @return
     */
    @Transactional(rollbackFor = Throwable.class)
    @Transactional
    public boolean createInOrder(InHedTB inHedTB, List<InDetTB> inDetTBs) {
        Order order = orderService.selectByNo(inHedTB.getBillNo());
        // 如果单据不存在则添加；如果单据存在，作业中无法修改，反之则修改单据
@@ -118,8 +118,9 @@
            orderDetl.setOrderNo(outDetTB.getBillNo());
            orderDetl.setOutOrderNo(outDetTB.getOrderNo());
            orderDetl.setAutoId(outDetTB.getAutoId());
            orderDetl.setLuHao(outDetTB.getLuHao());
            orderDetl.setSpecs(outDetTB.getSPgNO());
            orderDetl.setDetId(outDetTB.getDetId());
//            orderDetl.setLuHao(outDetTB.getLuHao());
//            orderDetl.setSpecs(outDetTB.getSPgNO());
            orderDetl.setPacking(outDetTB.getPacking());
            orderDetl.setWareId(outDetTB.getWareId());
            orderDetl.setWareName(outDetTB.getWareName());
@@ -152,7 +153,7 @@
    /**
     * @return
     */
    @Transactional(rollbackFor = Throwable.class)
    @Transactional
    public boolean createOutOrder(OutHedTB inHedTB, List<OutDetTB> inDetTBs) {
        Order order = orderService.selectByNo(inHedTB.getBillNo());
        // 如果单据不存在则添加；如果单据存在，作业中无法修改，反之则修改单据
@@ -220,7 +221,9 @@
            orderDetl.setOrderNo(outDetTB.getBillNo());
            orderDetl.setOutOrderNo(outDetTB.getOrderNo());
            orderDetl.setAutoId(outDetTB.getAutoId());
            orderDetl.setLuHao(outDetTB.getLuHao());
            orderDetl.setSpecs(mat.getSpecs());
            orderDetl.setDetId(outDetTB.getDetId());
//            orderDetl.setLuHao(outDetTB.getLuHao());
            orderDetl.setSpecs(outDetTB.getSPgNO());
            orderDetl.setPacking(outDetTB.getPacking());
            orderDetl.setWareId(outDetTB.getWareId());
@@ -233,7 +236,8 @@
            orderDetl.setTemp2(outDetTB.getTemp2());
            orderDetl.setTemp3(outDetTB.getTemp3());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setThreeCode(outDetTB.getDetId() + "");
            orderDetl.setThreeCode(outDetTB.getTemp1());
            orderDetl.setModel(outDetTB.getItemCode());
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);