*

whycq

2024-09-26 ec8f35851c6b92cf283579db68651abebc1a40e8

*

 src/main/java/com/zy/asrs/controller/AgvLocDetlController.java

@@ -8,9 +8,11 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
@@ -22,6 +24,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@@ -35,6 +38,8 @@
    private MatService matService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private DocTypeService docTypeService;

    @RequestMapping(value = "/locDetl/list/auth")
    @ManagerAuth
@@ -113,8 +118,18 @@
                    .where("loc_no like '" +row +"%'");
        }
        Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), wrapper);
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() != 33 && pakin.getDocId() != 35) {
                docIds.add(pakin.getDocId());
            }
        }
        for (AgvLocDetl record : agvLocDetlPage.getRecords()) {
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", record.getThreeCode()).eq("matnr", record.getMatnr()).ne("order_no", record.getOrderNo()).ne("order_no", "DB" + record.getOrderNo()));
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                    .eq("three_code", record.getThreeCode())
                    .eq("matnr", record.getMatnr())
                    .in("source",docIds));
            if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
                record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
            } else {

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

@@ -177,7 +177,7 @@
                }
            }
        }
        if (agvLocDetls.size() == sameNumber) {
        if (agvLocDetls.size() == sameNumber || agvLocDetls.size() == 1) {
            agvWrkMast.setIoType(101);
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.update(agvWrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", pickParams.getWrkNo()));