1

ZY

2024-10-30 9f96a3fa144da895976ee1be96b752786720aff1

1

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

@@ -1,5 +1,6 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
@@ -11,13 +12,15 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import io.swagger.models.auth.In;
import lombok.Synchronized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.*;
import java.util.stream.Collectors;
@@ -28,7 +31,7 @@
 */
@RestController
@RequestMapping("agvMobile")
public class AgvMobileController extends BaseController  {
public class AgvMobileController extends BaseController {


    private static final Logger log = LoggerFactory.getLogger(AgvMobileController.class);
@@ -58,7 +61,7 @@
    locno？组托+绑定暂存位 ： 组托
     */
    @PostMapping("/comb/auth")
    public R comb(@RequestBody CombParam combParam){
    public R comb(@RequestBody CombParam combParam) {
        agvMobileService.comb(combParam, getUserId());

        return R.ok();
@@ -67,7 +70,7 @@
    //    再次拣料
    @RequestMapping("/pick/again/auth")
    @ManagerAuth(memo = "再次拣料")
    public R pickAgain(@RequestBody PickParam pickParams){
    public R pickAgain(@RequestBody PickParam pickParams) {
        agvMobileService.pickAgain(pickParams, 1l);
        return R.ok("拣料成功");
    }
@@ -76,11 +79,11 @@
    绑定货架条码与暂存位
     */
    @PostMapping("/combBinging/auth")
    public R combBinding(@RequestBody Map<String,Object> map){
    public R combBinding(@RequestBody Map<String, Object> map) {
        String barcode = map.get("barcode").toString();
        String stationCode = map.get("stationCode").toString();
        Short containerType = Short.valueOf(barcode.substring(0,2));
        agvMobileService.combBinding(barcode,stationCode,containerType);
        Short containerType = Short.valueOf(barcode.substring(0, 2));
        agvMobileService.combBinding(barcode, stationCode, containerType);
        return R.ok("货架绑定站点成功");
    }

@@ -88,9 +91,9 @@
    获取当前已绑定的还没生成工作档的暂存位
     */
    @PostMapping("/getBasDevp/auth")
    public R getBasDevpByFloor(@RequestBody Map<String,Object> map){
    public R getBasDevpByFloor(@RequestBody Map<String, Object> map) {
        String floor = map.get("floor").toString();
        if("1".equals(floor) || "3".equals(floor)){
        if ("1".equals(floor) || "3".equals(floor)) {
            return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
        }
        return R.error("参数错误");
@@ -100,7 +103,7 @@
    获取输送线站点
     */
    @PostMapping("/getBasDevp/noCacheShelves/auth")
    public R getBasDevpByNoCacheShelves(){
    public R getBasDevpByNoCacheShelves() {
        return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
    }

@@ -109,15 +112,15 @@
     */
    @PostMapping("/pakin/auth")
    @Synchronized
    public R pakin(@RequestBody Map<String,Object> map){
    public R pakin(@RequestBody Map<String, Object> map) {
        List<String> devNos = (List<String>) map.get("devNo");

        List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
            return agvBasDevpService.selectById(devNo);
        }).collect(Collectors.toList());

        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
        
        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(), false);

        return R.ok("生成工作档成功");
    }

@@ -128,13 +131,14 @@
    @Synchronized
    @Transactional
    @ManagerAuth(memo = "启动入库")
    public R startPakin(@RequestBody AgvMobileStartPakin params){
    public R startPakin(@RequestBody AgvMobileStartPakin params) {
        log.info("启动入库,{}", JSON.toJSONString(params));
        // 组托
        params.getCombParams().forEach(combParam -> {
            agvMobileService.comb(combParam,getUserId());
            agvMobileService.comb(combParam, getUserId());
        });
        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
        workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
        workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false);

        return R.ok("生成工作档成功");
    }
@@ -145,11 +149,11 @@
    @PostMapping("/pakin/empty/auth")
    @Synchronized
    @ManagerAuth(memo = "空板入库")
    public R pakinEmpty(@RequestBody AgvMobileStartParam params){
    public R pakinEmpty(@RequestBody AgvMobileStartParam params) {

        for (AgvMobileStartParam.Pda pda : params.getPad()) {
            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
            workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
        }

        return R.ok();
@@ -161,10 +165,10 @@
    @PostMapping("/pakout/empty/auth")
    @Synchronized
    @ManagerAuth(memo = "空板出库")
    public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
    public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {

        for (AgvMobileStartParam.Pda pda : params.getPad()) {
            workService.emptyPlateOut(pda.getDevNo(),pda.getContainerType(), getUserId());
            workService.emptyPlateOut(pda.getDevNo(), pda.getContainerType(), getUserId());
        }

        return R.ok();
@@ -174,7 +178,7 @@
    空板出库货架码选择
     */
    @PostMapping("/pakout/empty/container/selector/auth")
    public R containerType(@RequestBody HashMap<String,String> params){
    public R containerType(@RequestBody HashMap<String, String> params) {

        String devNo = params.get("devNo");
        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
@@ -182,40 +186,40 @@
        return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));

    }
    

    /*
    查询库存 入库订单与销售单号
     */
    @PostMapping("/query/locDetl/v1")
    public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){
    public R queryAgvLocDetl(@RequestBody HashMap<String, String> params) {

        String orderNo = params.get("orderNo");
        String threeCode = params.get("threeCode");
        String matnr = params.get("matnr");
        String floor = params.get("floor");

        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1);
        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);


//        wrapper.eq("orderNo",orderNo);

        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);

        if (threeCode.substring(0,2).equals(30)) {
            wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
        if (threeCode.substring(0, 2).equals(30)) {
            wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
        }
        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
        List<AgvLocDetl> locDetls = new ArrayList<>();
        for (AgvLocDetl agvLocDetl : agvLocDetls) {
            AgvLocMast agvLocMast = new AgvLocMast();
            if (Cools.isEmpty(floor)) {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
            } else {
                // 如果是加工单 只在 lev1 = 1 查库存
                if ("JG".equals(orderNo.substring(0,2))) {
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
                if ("JG".equals(orderNo.substring(0, 2))) {
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1", 1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
                } else {
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
                }
            }

@@ -233,31 +237,31 @@
    查询库存 入库订单与销售单号
     */
    @PostMapping("/query/locDetl/v3")
    public R queryAgvLocDetl3(@RequestBody HashMap<String,String> params){
    public R queryAgvLocDetl3(@RequestBody HashMap<String, String> params) {

        String orderNo = params.get("orderNo");
        String threeCode = params.get("threeCode");
        String matnr = params.get("matnr");
        String floor = params.get("floor");

        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1);
        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);


//        wrapper.eq("orderNo",orderNo);

        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);

        if (threeCode.substring(0,2).equals(30)) {
            wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
        if (threeCode.substring(0, 2).equals(30)) {
            wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
        }
        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
        List<AgvLocDetl> locDetls = new ArrayList<>();
        for (AgvLocDetl agvLocDetl : agvLocDetls) {
            AgvLocMast agvLocMast = new AgvLocMast();
            if (Cools.isEmpty(floor)) {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
            } else {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
            }

            if (Cools.isEmpty(agvLocMast)) continue;
@@ -274,7 +278,7 @@
    查询库存 入库订单与销售单号
     */
    @PostMapping("/query/locDetl/v2")
    public R queryAgvLocDetl2(@RequestBody HashMap<String,String> params){
    public R queryAgvLocDetl2(@RequestBody HashMap<String, String> params) {

        String orderNo = params.get("orderNo");
        String threeCode = params.get("threeCode");
@@ -287,23 +291,23 @@

//        wrapper.eq("orderNo",orderNo);

        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);

        if (threeCode.substring(0,2).equals(30)) {
            wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
        if (threeCode.substring(0, 2).equals(30)) {
            wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
        }
        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
        List<AgvLocDetl> locDetls = new ArrayList<>();
        for (AgvLocDetl agvLocDetl : agvLocDetls) {
            AgvLocMast agvLocMast = new AgvLocMast();
            if (Cools.isEmpty(floor)) {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
            } else {
                // 如果是加工单 只在 lev1 = 1 查库存
                if (orderDetl.getSource().equals(35)) {
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1", 1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
                } else {
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
                }
            }

@@ -323,7 +327,7 @@
    @PostMapping("/check/detl/v1")
    @ManagerAuth(memo = "库存盘点")
    @Synchronized
    public R checkLocDetl(@RequestBody HashMap<String,String> param){
    public R checkLocDetl(@RequestBody HashMap<String, String> param) {

        String locNo = param.get("locNo");
        String containerCode = param.get("containerCode");
@@ -331,16 +335,16 @@
        List<AgvLocDetl> listByLocNo = null;
        List<AgvLocDetl> listByContainerCode = null;

        if(!Cools.isEmpty(locNo)){
        if (!Cools.isEmpty(locNo)) {
            listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
        }
        if(!Cools.isEmpty(locNo)){
        if (!Cools.isEmpty(locNo)) {
            listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
        }

        Map<String,Object> result = new HashMap<String,Object>();
        result.put("locNo",listByLocNo);
        result.put("containerCode",listByContainerCode);
        Map<String, Object> result = new HashMap<String, Object>();
        result.put("locNo", listByLocNo);
        result.put("containerCode", listByContainerCode);

        return R.ok(result);

@@ -352,21 +356,21 @@
    @PostMapping("/update/detl/v1")
    @ManagerAuth(memo = "纠正库位")
    @Synchronized
    public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
    public R updateLocDetlLocNo(@RequestBody HashMap<String, String> param) {
        String locNo = param.get("locNo");
        String containerCode = param.get("containerCode");

        if(Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)){
        if (Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)) {
            return R.error("参数不全");
        }

        List<AgvLocDetl> listByLocNo = null;
        List<AgvLocDetl> listByContainerCode = null;
        if(!Cools.isEmpty(locNo)){
        if (!Cools.isEmpty(locNo)) {
            // 源库位
            listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
        }
        if(!Cools.isEmpty(locNo)){
        if (!Cools.isEmpty(locNo)) {
            // 目标库位
            listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
        }
@@ -374,31 +378,30 @@
        AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
        AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));

        String barcode1 =  agvLocMastByLocNo.getBarcode();
        String barcode1 = agvLocMastByLocNo.getBarcode();



        if((!Cools.eq("F",agvLocMastByLocNo.getLocSts())
                && !Cools.eq("D",agvLocMastByLocNo.getLocSts()))){
        if ((!Cools.eq("F", agvLocMastByLocNo.getLocSts())
                && !Cools.eq("D", agvLocMastByLocNo.getLocSts()))) {

            return R.error("库位状态不为F或者D，无法维护");

        }
        // -------------1-----------------------------
        //库位信息为空 货架信息不为空
        if(Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)){
        if (Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)) {
            //更新货架信息的库位为当前库位
            listByContainerCode.forEach(agvLocDetl -> {
                String sourceLoc = agvLocDetl.getLocNo();
                agvLocDetl.setLocNo(locNo);
                agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
                agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
            });

            agvLocMastByLocNo.setLocSts("F");
            agvLocMastByLocNo.setBarcode(containerCode);
            agvLocMastService.updateById(agvLocMastByLocNo);

            if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F",agvLocMastByContainerCode.getLocSts())){
            if (!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F", agvLocMastByContainerCode.getLocSts())) {
                agvLocMastByContainerCode.setLocSts("D");
                agvLocMastByContainerCode.setBarcode(barcode1);
                agvLocMastService.updateById(agvLocMastByContainerCode);
@@ -410,13 +413,13 @@

        // -------------2-----------------------------
        //库位信息不为空 货架信息为空
        if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
        if (!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)) {
            String newLocNo = agvLocMastByContainerCode.getLocNo();
            //更新货架信息的库位为当前库位
            listByLocNo.forEach(agvLocDetl -> {
                String sourceLoc = agvLocDetl.getLocNo();
                agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
                agvLocDetlService.updateLocNo(newLocNo,sourceLoc,agvLocDetl);
                agvLocDetlService.updateLocNo(newLocNo, sourceLoc, agvLocDetl);
            });

            agvLocMastByContainerCode.setLocSts("F");
@@ -430,7 +433,7 @@
            return R.ok("维护成功");
        }

        if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
        if ((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)) {
            //agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
            //agvLocMastService.updateById(agvLocMastByContainerCode);

@@ -441,13 +444,12 @@
        }



        // --------------3----------------------------
        String locNo1 = listByContainerCode.get(0).getLocNo();
        listByContainerCode.forEach(agvLocDetl -> {
            String sourceLoc = agvLocDetl.getLocNo();
            agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
            agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
            agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
        });

        if (!Cools.isEmpty(listByLocNo)) {
@@ -456,7 +458,7 @@

            supp_codes.forEach(agvLocDetl -> {
                agvLocDetl.setLocNo(locNo1);
                agvLocDetlService.updateLocNo(locNo1,locNo,agvLocDetl);
                agvLocDetlService.updateLocNo(locNo1, locNo, agvLocDetl);
            });
        }

@@ -479,11 +481,11 @@
    @Transactional
    @ManagerAuth(memo = "调拨单任务下发")
    @Synchronized
    public R agvLocMove(@RequestBody HashMap<String,Object> params){
    public R agvLocMove(@RequestBody HashMap<String, Object> params) {
        String fl = String.valueOf(params.get("floor"));
        short floor =(short)Integer.parseInt(fl.substring(0, 1));
        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
         params.get("dbList");
        short floor = (short) Integer.parseInt(fl.substring(0, 1));
        List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        Object mT = params.get("moveType");
        String moveType = "";
        if (mT.equals("unAuto")) {
@@ -497,15 +499,15 @@
            AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
            agvLocMast.setLocType(moveType);
            agvLocMast.setLocType3(floor);
            agvLocMastService.update(agvLocMast,wrapper);
            agvLocMastService.update(agvLocMast, wrapper);
            // 同步调拨单
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
            for (AgvLocDetl agvLocDetl : agvLocDetls) {
                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
                    throw new CoolException("修改订单明细失败，请联系管理员" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
                }
            }
        }
@@ -516,11 +518,11 @@
    @Transactional
    @ManagerAuth(memo = "调拨单任务下发")
    @Synchronized
    public R agvLocMove2(@RequestBody HashMap<String,Object> params){
    public R agvLocMove2(@RequestBody HashMap<String, Object> params) {
        Date now = new Date();
        String fl = String.valueOf(params.get("floor"));
        Integer floor = Integer.parseInt(fl.substring(0, 1));
        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        Object mT = params.get("moveType");
        String moveType = "";
@@ -544,11 +546,11 @@
            if (!Cools.isEmpty(source_loc_no)) {
                throw new CoolException("当前库位已生成任务！");
            }
            AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
            AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
            if (Cools.isEmpty(locMastS)) {
                throw new CoolException("当前库位非在库状态！库位号="+locNo);
                throw new CoolException("当前库位非在库状态！库位号=" + locNo);
            }
            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30, floor);
            // 同步调拨单
            long flowId = snowflakeIdWorker.nextId();
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
@@ -567,7 +569,7 @@
                }

                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setSpare2(wrkMast.getWrkNo().toString());
@@ -595,8 +597,8 @@
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
                    throw new CoolException("修改订单明细失败，请联系管理员" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
                }
            }
            // 更新源库位
@@ -611,9 +613,9 @@
    @Transactional
    @ManagerAuth(memo = "回调单任务下发")
    @Synchronized
    public R agvLocMove3(@RequestBody HashMap<String,Object> params){
    public R agvLocMove3(@RequestBody HashMap<String, Object> params) {
        Date now = new Date();
        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
        params.get("dbList");
        for (HashMap<String, String> map : dbList) {
            String locNo = map.get("locNo");
@@ -622,11 +624,11 @@
            if (!Cools.isEmpty(source_loc_no)) {
                throw new CoolException("当前库位已生成任务！");
            }
            AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
            AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
            if (Cools.isEmpty(locMastS)) {
                throw new CoolException("当前库位非在库状态！库位号="+locNo);
                throw new CoolException("当前库位非在库状态！库位号=" + locNo);
            }
            AgvWrkMast wrkMast = createWrkMast(114, 22L, locNo, "", barcode, now, getUserId(), 30,1);
            AgvWrkMast wrkMast = createWrkMast(114, 22L, locNo, "", barcode, now, getUserId(), 30, 1);
            // 同步调拨单
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
            for (AgvLocDetl agvLocDetl : agvLocDetls) {
@@ -645,10 +647,10 @@
                // 更新订单
                // 先查询库订单明细 所属的订单

                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source", 36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("source", 36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
                    throw new CoolException("修改订单明细失败，请联系管理员" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
                }
            }
            // 更新源库位
@@ -663,7 +665,7 @@
    @Transactional
    @ManagerAuth(memo = "手动库位转移")
    @Synchronized
    public R handControlLocMove(@RequestBody LocMoveParam param){
    public R handControlLocMove(@RequestBody LocMoveParam param) {
        agvMobileService.handControlLocMove(param, getUserId());
        return R.ok();
    }
@@ -672,7 +674,7 @@
    @Transactional
    @ManagerAuth(memo = "调拨离场")
    @Synchronized
    public R allocationOut(@RequestBody AgvMobileStartPakin param){
    public R allocationOut(@RequestBody AgvMobileStartPakin param) {
        agvMobileService.allocationOut(param, getUserId());
        return R.ok();
    }
@@ -681,7 +683,7 @@
    @Transactional
    @ManagerAuth(memo = "调拨进场")
    @Synchronized
    public R allocationIn(@RequestBody AgvMobileStartPakin param){
    public R allocationIn(@RequestBody AgvMobileStartPakin param) {
        agvMobileService.allocationIn(param, getUserId());
        return R.ok();
    }
@@ -690,7 +692,7 @@
    @Transactional
    @ManagerAuth(memo = "空架离场")
    @Synchronized
    public R empOut(@RequestBody AgvMobileStartPakin param){
    public R empOut(@RequestBody AgvMobileStartPakin param) {
        agvMobileService.empOut(param, getUserId());
        return R.ok();
    }
@@ -699,7 +701,7 @@
    @Transactional
    @ManagerAuth(memo = "空架进场")
    @Synchronized
    public R empIn(@RequestBody AgvMobileStartPakin param){
    public R empIn(@RequestBody AgvMobileStartPakin param) {
        agvMobileService.empIn(param, getUserId());
        return R.ok();
    }
@@ -708,8 +710,8 @@
    @Transactional
    @ManagerAuth(memo = "站点回退")
    @Synchronized
    public R doBack(@RequestBody AgvMobileStartPakin param){
        if (Cools.isEmpty(param)){
    public R doBack(@RequestBody AgvMobileStartPakin param) {
        if (Cools.isEmpty(param)) {
            return R.error("参数为空");
        }
        agvMobileService.doBack(param, getUserId());
@@ -720,7 +722,7 @@
    @Transactional
    @ManagerAuth(memo = "转手动回流")
    @Synchronized
    public R handBack(@RequestBody AgvMobileStartPakin param){
    public R handBack(@RequestBody AgvMobileStartPakin param) {
        agvMobileService.handBack(param, getUserId());
        return R.ok();
    }
@@ -729,7 +731,7 @@
    @Transactional
    @ManagerAuth(memo = "确认加工完成")
    @Synchronized
    public R processed(@RequestBody AgvMobileStartPakin param){
    public R processed(@RequestBody AgvMobileStartPakin param) {
        agvMobileService.processed(param, getUserId());
        return R.ok();
    }
@@ -753,10 +755,11 @@

        System.out.println(agvLocDetls22.equals(agvLocDetls2));
    }

    /*
   生成工作档
    */
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode,  Date now, Long userId, int containerType,int floor){
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, int floor) {
        AgvWrkMast wrkMast = new AgvWrkMast();
        //工作状态
        wrkMast.setWrkSts(wrkSts);
@@ -785,7 +788,7 @@
            throw new CoolException("保存工作档失败");
        }

        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));

        return wrkMast;
    }

 src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java

@@ -3,6 +3,7 @@
import lombok.Data;

import java.util.List;
import java.util.Objects;

@Data
public class OrderSyncParam {
@@ -89,7 +90,7 @@
    }

    @Data
    public static class OrderDetl{
    public static class OrderDetl {
        //订单行号
        private String ivouchrowno;
        //物料编码
@@ -123,6 +124,18 @@
        //销售订单子表标识
        private String iorderdid;

        @Override
        public boolean equals(Object object) {
            if (this == object) return true;
            if (object == null || getClass() != object.getClass()) return false;
            OrderDetl orderDetl = (OrderDetl) object;
            return Objects.equals(cInvCode, orderDetl.cInvCode) && Objects.equals(bFree1, orderDetl.bFree1) && Objects.equals(cDefine22, orderDetl.cDefine22);
        }

        @Override
        public int hashCode() {
            return Objects.hash(ivouchrowno, cInvCode, batch, dArriveDate, iQuantity, iTaxPrice, iPerTaxRate, cbMemo, iNum, cSource, cDefine22, Rstates, csocode, bFree1, id, iorderdid);
        }

        public void setIvouchrowno(String ivouchrowno) {
            this.ivouchrowno = ivouchrowno;

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

@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2022/4/9
@@ -892,6 +893,11 @@
            //callApiLogSave(param, "/order/pakout/default/v1", "接受单据失败，该单据已存在，无法生成单据信息", false);
            //throw new CoolException("该单据已存在，无法生成单据信息");
        }
        List<OrderSyncParam.OrderDetl> collect = param.getChildren().stream().distinct().collect(Collectors.toList());
        if (collect.size()!= param.getChildren().size()){
            callApiLogSave(param, "/order/pakout/default/v1", "接受单据失败，单据明细重复，无法生成单据信息", false);
            throw new CoolException("接受单据失败，单据明细重复，无法生成单据信息");
        }
        Date now = new Date();
        Order order = orderMapping(param,now,pakin,docName);
        orderService.insert(order);
@@ -1029,7 +1035,7 @@
        //销售订单号
        od.setThreeCode(odParam.getCDefine22());
        //自由项
        od.setDeadTime(odParam.getBFree1());
        od.setBatch(odParam.getBFree1());
        //IDs
        od.setSku(odParam.getId());