Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

9 小时以前 fe8d6e225812fee9723a3a942481fdaf171a9dbc

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -14,12 +14,11 @@
import com.zy.api.entity.StockAdjustParams;
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.dto.XSR;
import com.zy.api.enums.MatLocType;
import com.zy.api.service.KopenApiService;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.CheckOrderDetlServiceImpl;
import com.zy.asrs.service.impl.LocDetlServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -48,8 +47,6 @@
@Service
public class OrderSyncHandler extends AbstractHandler<String> {

    private final CheckOrderDetlServiceImpl checkOrderDetlService;

    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
@@ -68,11 +65,11 @@
    private KopenApiService kopenApiService;
    @Autowired
    private MatService matService;
    private LocDetlServiceImpl locDetlService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    CheckOrderDetlService checkOrderDetlService;

    OrderSyncHandler(CheckOrderDetlServiceImpl checkOrderDetlService) {
        this.checkOrderDetlService = checkOrderDetlService;
    }

    @Transactional
    public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -292,7 +289,7 @@
                        .setPro_id(detl.getSuppCode())
                        .setLocation_no(locDetl.getZpallet())
                        .setSj_emp(locDetl.getModiUser$())
                        .setLocation_type(material.getTagId() + "")
                        .setLocation_type(MatLocType.getMatTag(material.getTagId()  + ""))
                        // 上报时，默认上报时间是更新时间
                        .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss") )
                        // 上报时，默认上报人是更新人
@@ -314,8 +311,11 @@
            try {
                List<ReportOrderParam> orderParams = new ArrayList<>();
                orderParams.add(orderParam);
                response = kopenApiService.getInDispatchResult(orderParams);

                if (order.getReportOnce() < 4) {
                    response = kopenApiService.getInDispatchResult(orderParams, order);
                } else {
                    return FAIL;
                }
                // if (true) {
                // success = true;
                // // 修改订单状态 4.完成 ===>> 6.已上报