#

1

昨天 648bc18887322eb7972e638bfe7131aede47799b

#

 src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java

@@ -60,5 +60,5 @@
    List<OrderDetlPakin> selectOrderDetls(@Param("orderNo")String orderNo,@Param("sku")String sku,@Param("upc") String upc);
    List<OrderDetlPakin> selectOrderDetlsByOrderNo(@Param("orderNo")String orderNo);

    boolean morpt(@Param("orderNo")String orderNo);
    boolean morpt(@Param("orderNo")String orderNo,@Param("matnr")String matnr);
}

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -30,4 +30,7 @@
    List<String> AllStatusSatisfyOrder(@Param("moveStatus") Integer moveStatus);

    boolean updateOrderStatus(@Param("orderNo")String orderNo);

    boolean updateOrderStatus4(@Param("orderNo")String orderNo);

}

 src/main/java/com/zy/asrs/service/OrderDetlPakinService.java

@@ -35,7 +35,7 @@
    boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3
            , String boxType1, String boxType2, String boxType3, Double qty);

    boolean morpt(String orderNo);
    boolean morpt(String orderNo,String orderNo1);
    /**
     * 入出库任务生成时，更新单据表中作业数量
     * @param orderId

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -42,4 +42,6 @@

    boolean updateOrderStatus(String orderNo);

    boolean updateOrderStatus4(String orderNo);

}

 src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java

@@ -4,17 +4,20 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.param.OrderDetlByCode;
import com.zy.asrs.mapper.OrderDetlPakinMapper;
import com.zy.asrs.service.OrderDetlPakinService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("orderDetlPakinService")
public class OrderDetlPakinServiceImpl extends ServiceImpl<OrderDetlPakinMapper, OrderDetlPakin> implements OrderDetlPakinService {

    @Autowired
    private OrderDetlPakinService orderDetlPakinService;
    @Override
    public List<OrderDetlPakin> selectByOrderId(Long orderId) {
        return this.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId));
@@ -114,8 +117,25 @@
    }
    
    @Override
    public boolean morpt(String orderNo){
        return this.baseMapper.morpt(orderNo);
    public boolean morpt(String orderNo,String orderNo1){
        List<OrderDetlPakin> list1 = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo1));
        try{
            for (OrderDetlPakin item : list1) {
                Double anfme = item.getAnfme();
                Double qty = item.getQty();
                String matnr = item.getMatnr();
                if(anfme.equals(qty)){
                    OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectOne(
                            new EntityWrapper<OrderDetlPakin>().eq("matnr", matnr).eq("order_no", orderNo)
                    );
                    this.baseMapper.morpt(orderNo,matnr);
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            throw new CoolException("汇报单转换失败:" + e.getMessage());
        }
        return true;
    }

}

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -227,5 +227,9 @@
        return this.baseMapper.updateOrderStatus(orderNo);
    }

    @Override
    public boolean updateOrderStatus4(String orderNo){
        return this.baseMapper.updateOrderStatus4(orderNo);
    }

}

 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java

@@ -59,7 +59,7 @@
                        orderService.updateById(order);
                    }else if(order.getPayType() == 1 || order.getSalesman() != null){
                        Order order1 = orderService.selectByNo(order.getSalesman());
                        if(orderDetlPakinService.morpt(order.getSalesman())){
                        if(orderDetlPakinService.morpt(order.getSalesman(),order.getOrderNo())){
                            order.setSettle(11L); //yu/cheng/dan/deng/dai/chu/ku/dan
                            orderService.updateById(order);
                        }

 src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java

@@ -234,9 +234,7 @@
                }else{
                    if(order.getDocType() == 23L){
                        Order order1 = orderService.selectOne(new EntityWrapper<Order>().eq("salesman",order.getOrderNo()));
                        order1.setPayType(null);
                        order1.setSettle(4L);
                        orderService.updateById(order1);
                        orderService.updateOrderStatus4(order1.getOrderNo());
                    }
                    order.setSettle(8L); // 更新状态为已上报审核 9->8
                }

 src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java

@@ -273,7 +273,7 @@
                                        .fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
                                        .fluentPut("bizorg_number", "BU-00001")
                                        .fluentPut("dept_number", "Org-00002")
                                        .fluentPut("billstatus", "B")
                                        .fluentPut("billstatus", "A")
                                        .fluentPut("customer_number", "Cus-000004")
                                        .fluentPut("biztime", sdf1.format(nowMis))
                                        .fluentPut("biztype_number", "210")
@@ -407,8 +407,13 @@
                        String billNo = resultItem.getString("number");  // 获取返回的单据号
                        String billId = resultItem.getString("id");      // 获取返回的ID
                        order.setNumber(billId);
                        order.setShipCode(add.getString("billno"));
                        String jsonString = add.toJSONString();
                        JSONObject jsonObject = JSONObject.parseObject(jsonString);
                        String billno = jsonObject.getJSONArray("data")
                                .getJSONObject(0)
                                .getString("billno");

                        order.setShipCode(billno);  // 设置到 order 对象中
                    }
                } else {
                    log.error("接口调用失败，失败的操作数量: {}", failCount);

 src/main/resources/mapper/OrderDetlPakinMapper.xml

@@ -267,7 +267,7 @@
    <update id="morpt" parameterType="String">
        UPDATE man_order_detl_pakin
        SET qty = anfme, work_qty = anfme
        WHERE order_no = #{orderNo}
        WHERE order_no = #{orderNo} and matnr = #{matnr}
    </update>

</mapper>

 src/main/resources/mapper/OrderMapper.xml

@@ -149,4 +149,12 @@
        and order_no = #{orderNo}
    </update>

    <update id="updateOrderStatus4">
        update man_order
        set pay_type = null,
        settle = 4
        where 1=1
        and order_no = #{orderNo}
    </update>

</mapper>