skyouc
6 天以前 e046dba174365eb8934ee1e4206f09821145e876
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.template.WaitPakinTemplate;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.common.annotation.OperationLog;
@@ -65,7 +66,11 @@
    @PostMapping("/waitPakin/save")
    public R save(@RequestBody WaitPakin waitPakin) {
        try {
            waitPakinService.comb(waitPakin);
            if (waitPakin.getBarcode().contains("PK")) {
                waitPakinService.comb(waitPakin, OrderType.PK_IN_ORDER.id);
            } else {
                waitPakinService.comb(waitPakin, OrderType.UTC_IN_ORDER.id);
            }
        } catch (Exception e) {
            e.printStackTrace();
            return R.error(e.getMessage());
@@ -177,7 +182,11 @@
            waitPakin.setDetlId(orderDetl.getId());
            waitPakin.setMatnr(orderDetl.getMat$().getMatnr());
            waitPakin.setBatch(orderDetl.getBatch());
            waitPakinService.comb(waitPakin);
            if (waitPakinTemplate.getBarcode().contains("PK")) {
                waitPakinService.comb(waitPakin, OrderType.PK_IN_ORDER.id);
            } else {
                waitPakinService.comb(waitPakin, OrderType.UTC_IN_ORDER.id);
            }
        }
        return R.ok();
    }