13

zhang

1 天以前 1c0dbad152362ac704a27ecfc5b5d08247385d87

13

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

New file
@@ -0,0 +1,129 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.service.BasStationService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
public class BasStationController extends BaseController {

    @Autowired
    private BasStationService basStationService;

    @RequestMapping(value = "/basStation/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(basStationService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/basStation/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<BasStation> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasStation.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(basStationService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/basStation/add/auth")
    @ManagerAuth
    public R add(BasStation basStation) {
        basStationService.insert(basStation);
        return R.ok();
    }

    @RequestMapping(value = "/basStation/update/auth")
    @ManagerAuth
    public R update(BasStation basStation) {
        if (Cools.isEmpty(basStation) || null == basStation.getId()) {
            return R.error();
        }
        basStationService.updateById(basStation);
        return R.ok();
    }

    @RequestMapping(value = "/basStation/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            basStationService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/basStation/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<BasStation> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("basStation"));
        convert(map, wrapper);
        List<BasStation> list = basStationService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/basStationQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasStation> wrapper = new EntityWrapper<>();
        wrapper.like("dev_no", condition);
        Page<BasStation> page = basStationService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasStation basStation : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", basStation.getId());
            map.put("value", basStation.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/basStation/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasStation> wrapper = new EntityWrapper<BasStation>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basStationService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(BasStation.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

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

@@ -10,8 +10,8 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.entity.BasWhsType;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@
public class BasWhsController extends BaseController {

    @Autowired
    private BasWhsService basWhsService;
    private BasWhsTypeService basWhsService;

    @RequestMapping(value = "/basWhs/{id}/auth")
    @ManagerAuth
@@ -32,13 +32,9 @@

    @RequestMapping(value = "/basWhs/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
    public R list(@RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "10") Integer limit, @RequestParam(required = false) String orderByField, @RequestParam(required = false) String orderByType, @RequestParam Map<String, Object> param) {
        excludeTrash(param);
        EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
        EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
@@ -61,7 +57,7 @@

    @RequestMapping(value = "/basWhs/add/auth")
    @ManagerAuth(memo = "库位类型添加")
    public R add(BasWhs basWhs) {
    public R add(BasWhsType basWhs) {
        basWhs.setModiUser(getUserId());
        basWhs.setModiTime(new Date());
        basWhs.setAppeUser(getUserId());
@@ -72,7 +68,7 @@

    @RequestMapping(value = "/basWhs/update/auth")
    @ManagerAuth(memo = "库位类型修改")
    public R update(BasWhs basWhs) {
    public R update(BasWhsType basWhs) {
        if (Cools.isEmpty(basWhs) || null == basWhs.getId()) {
            return R.error();
        }
@@ -85,11 +81,11 @@
    @RequestMapping(value = "/basWhs/delete/auth")
    @ManagerAuth(memo = "库位类型删除")
    public R delete(@RequestParam String param) {
        List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
        List<BasWhsType> list = JSONArray.parseArray(param, BasWhsType.class);
        if (Cools.isEmpty(list)) {
            return R.error();
        }
        for (BasWhs entity : list) {
        for (BasWhsType entity : list) {
            basWhsService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
@@ -99,24 +95,24 @@
    @ManagerAuth(memo = "库位类型导出")
    public R export(@RequestBody JSONObject param) {
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
        EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("basWhs"));
        convert(map, wrapper);
        List<BasWhs> list = basWhsService.selectList(wrapper);
        List<BasWhsType> list = basWhsService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/basWhsQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
        EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
        wrapper.like("whs_desc", condition);
        Page<BasWhs> page = basWhsService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasWhsType> page = basWhsService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasWhs basWhs : page.getRecords()) {
        for (BasWhsType BasWhsType : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", basWhs.getIdentifying());
            map.put("value", basWhs.getWhsDesc());
            map.put("id", BasWhsType.getIdentifying());
            map.put("value", BasWhsType.getWhsDesc());
            result.add(map);
        }
        return R.ok(result);
@@ -125,9 +121,9 @@
    @RequestMapping(value = "/basWhs/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasWhs> wrapper = new EntityWrapper<BasWhs>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        Wrapper<BasWhsType> wrapper = new EntityWrapper<BasWhsType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basWhsService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(BasWhs.class, String.valueOf(param.get("key"))));
            return R.parse(BaseRes.REPEAT).add(getComment(BasWhsType.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

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

@@ -10,11 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.entity.BasWhsType;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.entity.Parameter;
@@ -33,7 +33,7 @@
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private BasWhsService basWhsService;
    private BasWhsTypeService basWhsService;

    @RequestMapping(value = "/locMast/init/pwd")
    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -202,7 +202,7 @@
    public R init(LocMastInitParam param) {
        try {
            List<LocMast> list = new ArrayList<>();
            BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
            BasWhsType basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
            if (Cools.isEmpty(basWhs)) {
                return R.error("库型不存在！！！");
            }

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

@@ -12,7 +12,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.MobileService;
@@ -94,7 +94,6 @@
    public R find(@RequestParam("matnr") String matnr) {
        return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
    }



    @RequestMapping(value = "/mat/list/auth")
@@ -241,10 +240,10 @@
        if (mat == null) {
            return R.ok();
        }
        OrderDetl orderDetl = new OrderDetl();
        orderDetl.sync(mat);
        orderDetl.setAnfme(0.0D);
        return R.ok().add(orderDetl);
        OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
        orderDetlPakout.sync(mat);
        orderDetlPakout.setAnfme(0.0D);
        return R.ok().add(orderDetlPakout);
    }

    /*************************************** 打印相关 ***********************************************/

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

@@ -9,7 +9,10 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.ForwardAGVTaskParam;
import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
@@ -52,8 +55,6 @@
    private WrkDetlService wrkDetlService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private PackService packService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
@@ -218,13 +219,13 @@
        if (Cools.isEmpty(orderNo)) {
            orderNo = null;
        }
        List<Order> orders = orderService.selectorderNoL(orderNo);
        List<OrderPakin> orders = orderService.selectorderNoL(orderNo);
        if (Cools.isEmpty(orders)) {
            return R.ok();
        }
        LinkedList<CombParam> combParams = new LinkedList<>();
        if (!Cools.isEmpty(orders)) {
            for (Order order : orders) {
            for (OrderPakin order : orders) {
                CombParam combParam = new CombParam();
                if (order == null) {
                    continue;
@@ -236,16 +237,16 @@
                if (order.getSettle() > 2) {
                    continue;
                }
                List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
                if (!Cools.isEmpty(orderDetls)) {
                List<OrderDetlPakout> orderDetlPakouts = orderService.selectWorkingDetls(order.getId());
                if (!Cools.isEmpty(orderDetlPakouts)) {
                    LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
                    for (OrderDetl orderDetl : orderDetls) {
                    for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
                        CombParam.CombMat combMat = new CombParam.CombMat();
                        combMat.setMatnr(orderDetl.getMatnr());
                        combMat.setBatch(orderDetl.getBatch());
                        combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMat.setMatnr(orderDetlPakout.getMatnr());
                        combMat.setBatch(orderDetlPakout.getBatch());
                        combMat.setAnfme(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty());
                        combMat.setMaktx(orderDetlPakout.getMaktx());
                        combMat.setSpecs(orderDetlPakout.getSpecs());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
@@ -280,25 +281,8 @@
    }


    @RequestMapping("/pack/get/auth")
    @ManagerAuth
    public R packGet(@RequestParam String barcode) {
        Pack pack = packService.selectByBarcode(barcode);
        if (pack == null) {
            return R.ok();
        }
        if (pack.getSettle() == 1L) {
            return R.ok().add(pack);
        }
        return R.ok("组托成功");
    }

    @RequestMapping("/pack/comb/auth")
    @ManagerAuth(memo = "下线组托")
    public R packComb(@RequestBody CombParam combParam) {
        mobileService.packComb(combParam, getUserId());
        return R.ok("组托成功");
    }



    // 出库 ---------------------------------------------------------------------------------------------------
@@ -358,16 +342,16 @@
            return R.ok();
        }
//        List<Order> orders = orderService.selectorderNoL(batch);
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
        if (Cools.isEmpty(orderDetl)) {
        OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
        if (Cools.isEmpty(orderDetlPakout)) {
            return R.error("未查到数据");
        }
        if (!orderDetl.getQty$().equals("已完成")) {
        if (!orderDetlPakout.getQty$().equals("已完成")) {
            return R.error("任务未完成");
        }
        //复核数
        orderDetl.setSource(1);
        orderDetlService.updateById(orderDetl);
        orderDetlPakout.setSource(1);
        orderDetlService.updateById(orderDetlPakout);
        return R.ok();
    }

@@ -519,7 +503,6 @@
    }



    @PostMapping("/order/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -529,7 +512,6 @@
        mobileService.pakoutByOrder(param, getUserId());
        return R.ok("出库成功");
    }



    @RequestMapping("/ddd/ddd")

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

@@ -14,8 +14,6 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.PakinParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.NodeService;
import com.zy.common.entity.NodeExcel;
@@ -306,7 +304,6 @@
                .eq("type", "3"));
        return R.ok().add(allEmptys);
    }



    @RequestMapping(value = "/node/select/{id}/auth")

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

@@ -45,13 +45,13 @@
    @RequestMapping(value = "/order/search/pda/auth")
    @ManagerAuth
    public R pdaOrderSearch(@RequestParam(required = false) String condition) {
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(condition)) {
//            wrapper.like("matnr", condition).or().like("maktx", condition);
            wrapper.like("order_no", condition);
        }
        wrapper.orderBy("create_time", false);
        List<Order> mats = orderService.selectList(wrapper);
        List<OrderPakin> mats = orderService.selectList(wrapper);
        return R.ok().add(mats);
    }

@@ -66,12 +66,12 @@
        docTypes.forEach(docType -> {
            arrayList.add(docType.getDocId().intValue());
        });
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
//        wrapper.eq("tag_id", tagId);
        wrapper.in("doc_type", arrayList);
        wrapper.in("settle", 1, 2);
        wrapper.orderBy("create_time", false);
        Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
        Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok().add(orderPage);
    }

@@ -85,30 +85,30 @@
        docTypes.forEach(docType -> {
            arrayList.add(docType.getDocId().intValue());
        });
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
//        wrapper.eq("tag_id", tagId);
        wrapper.in("doc_type", arrayList);
        wrapper.in("settle", 1, 2);
        wrapper.orderBy("create_time", false);
        Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
        Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok().add(orderPage);
    }

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
    public R navList(@RequestParam(required = false) String orderNo) {
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }
        wrapper.le("settle", 2).eq("status", 1);
        wrapper.orderBy("create_time", false);
        List<Order> orders = orderService.selectList(wrapper);
        List<OrderPakin> orders = orderService.selectList(wrapper);
        // 保留出库单
        if (!Cools.isEmpty(orders)) {
            Iterator<Order> iterator = orders.iterator();
            Iterator<OrderPakin> iterator = orders.iterator();
            while (iterator.hasNext()) {
                Order order = iterator.next();
                OrderPakin order = iterator.next();
                if (order.getDocType() != null) {
                    DocType docType = docTypeService.selectById(order.getDocType());
                    if (docType != null) {
@@ -129,7 +129,7 @@
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)) {
@@ -144,7 +144,7 @@
    @RequestMapping(value = "/order/detl/all/auth")
    @ManagerAuth
    public R head(@RequestParam Long orderId) {
        return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
        return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId)));
    }

    @RequestMapping(value = "/order/form/add/auth")
@@ -159,12 +159,12 @@
            }
            param.setOrderNo(prefix + snowflakeIdWorker.nextId());
        }
        Order order = orderService.selectByNo(param.getOrderNo());
        OrderPakin order = orderService.selectByNo(param.getOrderNo());
        if (order != null) {
            return R.error("单据编号已存在");
        }
        Date now = new Date();
        order = new Order(
        order = new OrderPakin(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                DateUtils.convert(now),    // 单据日期
@@ -204,25 +204,25 @@
            throw new CoolException("保存订单主档失败");
        }
        List<DetlDto> list = new ArrayList<>();
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
        for (OrderDetlPakout orderDetlPakout : param.getOrderDetlPakoutList()) {
            DetlDto dto = new DetlDto(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
                item.setAnfme(item.getAnfme() + orderDetlPakout.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("保存订单明细档失败");
                }
            } else {
                list.add(dto);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(getUserId());
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(getUserId());
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.insert(orderDetl)) {
                orderDetlPakout.setOrderId(order.getId());
                orderDetlPakout.setOrderNo(order.getOrderNo());
                orderDetlPakout.setCreateBy(getUserId());
                orderDetlPakout.setCreateTime(now);
                orderDetlPakout.setUpdateBy(getUserId());
                orderDetlPakout.setUpdateTime(now);
                orderDetlPakout.setStatus(1);
                orderDetlPakout.setQty(0.0D);
                if (!orderDetlService.insert(orderDetlPakout)) {
                    throw new CoolException("保存订单明细档失败");
                }
            }
@@ -234,7 +234,7 @@
    @ManagerAuth(memo = "手动修改订单")
    @Transactional
    public R formModify(@RequestBody OrderDomainParam param) {
        Order order = orderService.selectById(param.getOrderId());
        OrderPakin order = orderService.selectById(param.getOrderId());
        if (order == null || order.getStatus() == 0) {
            return R.error("订单不存在");
        }
@@ -252,30 +252,30 @@
        // 修改明细档
//        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        // 1.清空明细档
        if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
        if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
            throw new CoolException("清空订单明细失败");
        }
        // 2.重组数据
        List<DetlDto> list = new ArrayList<>();
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
        for (OrderDetlPakout orderDetlPakout : param.getOrderDetlPakoutList()) {
            DetlDto dto = new DetlDto(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
                item.setAnfme(item.getAnfme() + orderDetlPakout.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("保存订单明细档失败");
                }
            } else {
                list.add(dto);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(getUserId());
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(getUserId());
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.insert(orderDetl)) {
                orderDetlPakout.setOrderId(order.getId());
                orderDetlPakout.setOrderNo(order.getOrderNo());
                orderDetlPakout.setCreateBy(getUserId());
                orderDetlPakout.setCreateTime(now);
                orderDetlPakout.setUpdateBy(getUserId());
                orderDetlPakout.setUpdateTime(now);
                orderDetlPakout.setStatus(1);
                orderDetlPakout.setQty(0.0D);
                if (!orderDetlService.insert(orderDetlPakout)) {
                    throw new CoolException("保存订单明细档失败");
                }
            }
@@ -286,23 +286,23 @@
    @PostMapping(value = "/order/wrk/trace/auth")
    @ManagerAuth
    public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
        Order order = orderService.selectById(orderId);
        OrderPakin order = orderService.selectById(orderId);
        if (null == order) {
            return R.error("单据不存在");
        }
        // 数量统计
        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(orderId);
        double totalQty = 0;
        double wrkQty = 0;
        double lackQty = 0;
        double endQty = 0;
        for (OrderDetl orderDetl : orderDetls) {
            totalQty = totalQty + orderDetl.getAnfme();
            wrkQty = wrkQty + orderDetl.getWorkQty();
            endQty = endQty + orderDetl.getQty();
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            totalQty = totalQty + orderDetlPakout.getAnfme();
            wrkQty = wrkQty + orderDetlPakout.getWorkQty();
            endQty = endQty + orderDetlPakout.getQty();
            double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
            if (issued > 0.0) {
                List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null, null, null, null);
                List<LocDetl> locDetls = locDetlService.queryStock(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getOrigin(), null, null, null, null);
                for (LocDetl locDetl : locDetls) {
                    if (issued > 0) {
                        issued = issued - locDetl.getAnfme();
@@ -373,7 +373,7 @@
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)) {
@@ -397,7 +397,7 @@

    @RequestMapping(value = "/order/update/auth")
    @ManagerAuth
    public R update(Order order) {
    public R update(OrderPakin order) {
        if (Cools.isEmpty(order) || null == order.getId()) {
            return R.error();
        }
@@ -438,22 +438,22 @@
    @RequestMapping(value = "/order/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
        convert(map, wrapper);
        List<Order> list = orderService.selectList(wrapper);
        List<OrderPakin> list = orderService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/orderQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
        Page<OrderPakin> page = orderService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Order order : page.getRecords()) {
        for (OrderPakin order : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", order.getId());
            map.put("value", order.getOrderNo());
@@ -465,9 +465,9 @@
    @RequestMapping(value = "/order/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        Wrapper<OrderPakin> wrapper = new EntityWrapper<OrderPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != orderService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
            return R.parse(BaseRes.REPEAT).add(getComment(OrderPakin.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

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

@@ -9,7 +9,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
@@ -34,7 +34,7 @@
    @RequestMapping(value = "/orderDetl/search/pda/auth")
    @ManagerAuth
    public R pdaOrderDetlSearch(@RequestParam(required = false) String condition, @RequestParam(required = false) String order) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(condition)) {
//            wrapper.like("matnr", condition).or().like("maktx", condition);

@@ -42,13 +42,13 @@
        }
        wrapper.eq("order_no", order);
        wrapper.orderBy("create_time", false);
        List<OrderDetl> mats = orderDetlService.selectList(wrapper);
        List<OrderDetlPakout> mats = orderDetlService.selectList(wrapper);
        return R.ok().add(mats);
    }

    @PostMapping("/orderDetl/list/pda/auth")
    public R getPdaOrderDetl(@RequestBody Map<String, Object> map) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
        wrapper.eq("order_no", map.get("orderNo"));
        return R.ok(orderDetlService.selectList(wrapper));
    }
@@ -66,7 +66,7 @@
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)) {
@@ -75,7 +75,7 @@
            wrapper.orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
        Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderDetlPage);
    }

@@ -84,7 +84,7 @@
    public R pakoutList(@RequestParam(defaultValue = "1") Integer curr,
                        @RequestParam(defaultValue = "10") Integer limit,
                        @RequestParam Map<String, Object> param) {
        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetlPakout.class)));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
@@ -102,18 +102,18 @@

    @RequestMapping(value = "/orderDetl/add/auth")
    @ManagerAuth
    public R add(OrderDetl orderDetl) {
        orderDetlService.insert(orderDetl);
    public R add(OrderDetlPakout orderDetlPakout) {
        orderDetlService.insert(orderDetlPakout);
        return R.ok();
    }

    @RequestMapping(value = "/orderDetl/update/auth")
    @ManagerAuth
    public R update(OrderDetl orderDetl) {
        if (Cools.isEmpty(orderDetl) || null == orderDetl.getId()) {
    public R update(OrderDetlPakout orderDetlPakout) {
        if (Cools.isEmpty(orderDetlPakout) || null == orderDetlPakout.getId()) {
            return R.error();
        }
        orderDetlService.updateById(orderDetl);
        orderDetlService.updateById(orderDetlPakout);
        return R.ok();
    }

@@ -129,25 +129,25 @@
    @RequestMapping(value = "/orderDetl/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
        convert(map, wrapper);
        List<OrderDetl> list = orderDetlService.selectList(wrapper);
        List<OrderDetlPakout> list = orderDetlService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/orderDetlQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
        Page<OrderDetlPakout> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (OrderDetl orderDetl : page.getRecords()) {
        for (OrderDetlPakout orderDetlPakout : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", orderDetl.getId());
            map.put("value", orderDetl.getId());
            map.put("id", orderDetlPakout.getId());
            map.put("value", orderDetlPakout.getId());
            result.add(map);
        }
        return R.ok(result);
@@ -156,9 +156,9 @@
    @RequestMapping(value = "/orderDetl/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != orderDetlService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(OrderDetl.class, String.valueOf(param.get("key"))));
            return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

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

@@ -11,9 +11,8 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.ExistDto;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
@@ -54,7 +53,7 @@
    @ManagerAuth
    public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
        Thread.sleep(200);
        return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
        return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetlPakout::getId).distinct().collect(Collectors.toList()));
    }

    @PostMapping("/out/pakout/OrderOutGetLoc/auth")
@@ -64,12 +63,12 @@
            return R.parse(BaseRes.PARAM);
        }
        // 获取订单明细并处理
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
        Set<String> processedLocs = new HashSet<>(); // 已处理货位缓存
        Set<ExistDto> processedStock = new HashSet<>(); // 已处理库存缓存
        List<LocDto> result = new ArrayList<>();

        for (OrderDetl detl : orderDetls) {
        for (OrderDetlPakout detl : orderDetlPakouts) {
            result.addAll(processOrderDetl(detl, null, processedLocs, processedStock));
        }

@@ -95,12 +94,12 @@


        // 获取订单明细并处理
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
        Set<String> processedLocs = new HashSet<>(); // 已处理货位缓存
        Set<ExistDto> processedStock = new HashSet<>(); // 已处理库存缓存
        List<LocDto> result = new ArrayList<>();

        for (OrderDetl detl : orderDetls) {
        for (OrderDetlPakout detl : orderDetlPakouts) {
            result.addAll(processOrderDetl(detl, amount, processedLocs, processedStock));
        }

@@ -110,15 +109,15 @@
    /**
     * 处理单个订单明细的货位分配
     *
     * @param orderDetl      订单明细
     * @param orderDetlPakout      订单明细
     * @param requiredAmount 需求出库量
     * @param processedLocs  已处理的货位集合（用于去重）
     * @param processedStock 已处理的库存记录集合（用于去重）
     */
    private List<LocDto> processOrderDetl(OrderDetl orderDetl, Double requiredAmount,
    private List<LocDto> processOrderDetl(OrderDetlPakout orderDetlPakout, Double requiredAmount,
                                          Set<String> processedLocs, Set<ExistDto> processedStock) {
        List<LocDto> result = new ArrayList<>();
        double remaining = Optional.ofNullable(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
        double remaining = Optional.ofNullable(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);

        // 调整校验逻辑：当requiredAmount不为null时才校验
        if (requiredAmount != null) {
@@ -126,7 +125,7 @@
                throw new CoolException("出库数量必须大于0");
            }
            if (requiredAmount > remaining) {
                throw new CoolException("订单" + orderDetl.getOrderNo() + "请求数量超过可出库数量，剩余可出：" + remaining);
                throw new CoolException("订单" + orderDetlPakout.getOrderNo() + "请求数量超过可出库数量，剩余可出：" + remaining);
            }
            // 当指定数量时，使用指定数量覆盖剩余量
            remaining = Math.min(requiredAmount, remaining);
@@ -134,9 +133,9 @@

        // 获取可用库存记录
        List<LocDetl> stocks = locDetlService.queryStock(
                orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getSuppCode(),
                processedLocs, orderDetl.getSupp(),
                orderDetl.getTemp1(), orderDetl.getTemp2()
                orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getSuppCode(),
                processedLocs, orderDetlPakout.getSupp(),
                orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2()
        );

        // 遍历处理每个库存记录
@@ -148,11 +147,11 @@

            // 非7号堆垛机处理逻辑
            if (locMast.getCrnNo() != 7) {
                processNormalLocation(stock, orderDetl, remaining, processedStock, result);
                processNormalLocation(stock, orderDetlPakout, remaining, processedStock, result);
            }
            // 7号堆垛机特殊处理
            else {
                processCrn7Location(locMast, stock, orderDetl, remaining, processedStock, result);
                processCrn7Location(locMast, stock, orderDetlPakout, remaining, processedStock, result);
            }

            remaining -= stock.getAnfme();
@@ -160,7 +159,7 @@

        // 处理缺量情况
        if (remaining > 0) {
            result.add(createShortageDto(orderDetl, remaining));
            result.add(createShortageDto(orderDetlPakout, remaining));
        }

        return result;
@@ -169,10 +168,10 @@
    /**
     * 创建缺量DTO
     */
    private LocDto createShortageDto(OrderDetl orderDetl, double qty) {
        LocDto dto = new LocDto(null, orderDetl.getMatnr(),
                orderDetl.getMaktx(), orderDetl.getBatch(),
                orderDetl.getOrderNo(), qty);
    private LocDto createShortageDto(OrderDetlPakout orderDetlPakout, double qty) {
        LocDto dto = new LocDto(null, orderDetlPakout.getMatnr(),
                orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(),
                orderDetlPakout.getOrderNo(), qty);
        dto.setLack(true);
        return dto;
    }
@@ -180,7 +179,7 @@
    /**
     * 处理普通货位
     */
    private void processNormalLocation(LocDetl stock, OrderDetl orderDetl, double remaining,
    private void processNormalLocation(LocDetl stock, OrderDetlPakout orderDetlPakout, double remaining,
                                       Set<ExistDto> processedStock, List<LocDto> result) {
        ExistDto exist = new ExistDto()
                .setLocNo(stock.getLocNo())
@@ -189,14 +188,14 @@

        if (processedStock.add(exist)) {
            double allocateQty = Math.min(remaining, stock.getAnfme());
            result.add(buildLocDto(stock, orderDetl, allocateQty));
            result.add(buildLocDto(stock, orderDetlPakout, allocateQty));
        }
    }

    /**
     * 处理7号堆垛机货位
     */
    private void processCrn7Location(LocMast baseLoc, LocDetl stock, OrderDetl orderDetl,
    private void processCrn7Location(LocMast baseLoc, LocDetl stock, OrderDetlPakout orderDetlPakout,
                                     double remaining, Set<ExistDto> processedStock,
                                     List<LocDto> result) {
        // 构建查询条件
@@ -209,13 +208,13 @@
        // 获取同组货位并处理
        locMastService.selectList(wrapper).stream()
                .filter(loc -> "F".equals(loc.getLocSts()))
                .forEach(loc -> processCrn7SubLocation(loc, stock, orderDetl, remaining, processedStock, result));
                .forEach(loc -> processCrn7SubLocation(loc, stock, orderDetlPakout, remaining, processedStock, result));
    }

    /**
     * 处理7号堆垛机子货位
     */
    private void processCrn7SubLocation(LocMast loc, LocDetl stock, OrderDetl orderDetl,
    private void processCrn7SubLocation(LocMast loc, LocDetl stock, OrderDetlPakout orderDetlPakout,
                                        double remaining, Set<ExistDto> processedStock,
                                        List<LocDto> result) {
        LocDetl subStock = locDetlService.selectOne(
@@ -232,7 +231,7 @@

            if (processedStock.add(exist) && remaining > 0) {
                double allocateQty = Math.min(remaining, subStock.getAnfme());
                result.add(buildLocDto(subStock, orderDetl, allocateQty));
                result.add(buildLocDto(subStock, orderDetlPakout, allocateQty));
            }
        }
    }
@@ -240,10 +239,10 @@
    /**
     * 构建货位DTO通用方法
     */
    private LocDto buildLocDto(LocDetl stock, OrderDetl orderDetl, double qty) {
    private LocDto buildLocDto(LocDetl stock, OrderDetlPakout orderDetlPakout, double qty) {
        LocDto dto = new LocDto(
                stock.getLocNo(), stock.getMatnr(), stock.getMaktx(),
                stock.getBatch(), orderDetl.getOrderNo(), qty
                stock.getBatch(), orderDetlPakout.getOrderNo(), qty
        );

        // 获取工作站并转换
@@ -253,102 +252,12 @@
        List<LocDto.staListDto> staList = staNos.stream()
                .map(staNo -> new LocDto.staListDto()
                        .setStaNo(staNo)
                        .setStaName(Utils.getStaName(staNo)))
                )
                .collect(Collectors.toList());

        dto.setStaNos(staList);
        return dto;
    }

    // 新增方法
//    private List<LocDto> processOrderDetl(OrderDetl orderDetl, Double amount, Set<String> exist, Set<ExistDto> existDtos) {
//        List<LocDto> result = new ArrayList<>();
//        double issued = Optional.ofNullable(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
//
//        if (amount != null && amount > issued) {
//            throw new CoolException("数量高于可出库数量");
//        }
//
//        List<LocDetl> locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
//        for (LocDetl locDetl : locDetls) {
//            if (issued <= 0) break;
//            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
//            if (locMast.getCrnNo() != 7) {
//                ExistDto existDto = new ExistDto();
//                existDto.setLocNo(locDetl.getLocNo());
//                existDto.setMatnr(locDetl.getMatnr());
//                existDto.setBatch(locDetl.getBatch());
//                if (existDtos.add(existDto)) {
//                    LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
//                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
//                    List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
//                    List<LocDto.staListDto> maps = new ArrayList<>();
//                    for (Integer staNo : staNos) {
//                        LocDto.staListDto staListDto = new LocDto.staListDto();
//                        staListDto.setStaNo(staNo);
//                        staListDto.setStaName(Utils.getStaName(staNo));
//                        maps.add(staListDto);
//                    }
//                    locDto.setStaNos(maps);
//                    result.add(locDto);
//                    // 剩余待出数量递减
//                    issued = issued - locDetl.getAnfme();
//                }
//            }else {
//                List<LocMast> locMasts = new ArrayList<>();
//                if (locMast.getBay1() ==6 || locMast.getBay1()==5){
//                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                            .eq("gro1", locMast.getGro1())
//                            .eq("crn_no", 7)
//                            .eq("loc_type1",locMast.getLocType1())
//                            .orderBy("bay1", true));
//                }else{
//                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                            .eq("gro1", locMast.getGro1())
//                            .eq("crn_no", 7)
//                            .eq("loc_type1",locMast.getLocType1())
//                            .orderBy("bay1", false));
//                }
//                for (LocMast locMast1 : locMasts){
//                    if (locMast1.getLocSts().equals("F")){
//                        LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
//                                .eq("loc_No", locMast1.getLocNo())
//                                .eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
//                        if (!Cools.isEmpty(locDetl1)) {
//                            ExistDto existDto = new ExistDto();
//                            existDto.setLocNo(locDetl1.getLocNo());
//                            existDto.setMatnr(locDetl1.getMatnr());
//                            existDto.setBatch(locDetl1.getBatch());
//                            if (existDtos.add(existDto)){
//                                if (issued <= 0) break;
//                                LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
//                                        issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
//                                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl1.getLocNo(), issued >= locDetl1.getAnfme() ? 101 : 103);
//                                List<LocDto.staListDto> maps = new ArrayList<>();
//                                for (Integer staNo : staNos) {
//                                    LocDto.staListDto staListDto = new LocDto.staListDto();
//                                    staListDto.setStaNo(staNo);
//                                    staListDto.setStaName(Utils.getStaName(staNo));
//                                    maps.add(staListDto);
//                                }
//                                locDto.setStaNos(maps);
//                                result.add(locDto);
//                                // 剩余待出数量递减
//                                issued = issued - locDetl.getAnfme();
//
//                            }
//                        }
//                    }
//                }
//            }
//        }
//        if (issued > 0) {
//            LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
//            locDto.setLack(Boolean.TRUE);
//            result.add(locDto);
//        }
//        return result;
//    }


    /**
@@ -362,14 +271,14 @@
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();
        Set<ExistDto> existDtos = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
            if (!Cools.isEmpty(amount)) {
                if (amount > issued) {
                    return R.error("数量高于可出库数量");
@@ -380,7 +289,7 @@
                continue;
            }
            List<LocDetl> locDetls = new ArrayList<>();
            locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
            locDetls = locDetlService.queryStockFour(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
            for (LocDetl locDetl : locDetls) {
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                if (locMast.getLocSts().equals("F")) {
@@ -394,14 +303,13 @@
                        existDto.setBatch(locDetl1.getBatch());
                        if (existDtos.add(existDto)) {
                            if (issued > 0) {
                                LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
                                LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetlPakout.getOrderNo(),
                                        issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
                                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl1.getLocNo(), issued >= locDetl1.getAnfme() ? 101 : 103);
                                List<LocDto.staListDto> maps = new ArrayList<>();
                                for (Integer staNo : staNos) {
                                    LocDto.staListDto staListDto = new LocDto.staListDto();
                                    staListDto.setStaNo(staNo);
                                    staListDto.setStaName(Utils.getStaName(staNo));
                                    maps.add(staListDto);
                                }
                                locDto.setStaNos(maps);
@@ -417,7 +325,7 @@

            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }
@@ -431,19 +339,19 @@
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();
        Set<ExistDto> existDtos = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
            if (issued <= 0.0D) {
                continue;
            }
            List<LocDetl> locDetls = new ArrayList<>();
            locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
            locDetls = locDetlService.queryStockFour(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
            for (LocDetl locDetl : locDetls) {
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                if (locMast.getLocSts().equals("F")) {
@@ -457,14 +365,13 @@
                        existDto.setBatch(locDetl1.getBatch());
                        if (existDtos.add(existDto)) {
                            if (issued > 0) {
                                LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
                                LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetlPakout.getOrderNo(),
                                        issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
                                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl1.getLocNo(), issued >= locDetl1.getAnfme() ? 101 : 103);
                                List<LocDto.staListDto> maps = new ArrayList<>();
                                for (Integer staNo : staNos) {
                                    LocDto.staListDto staListDto = new LocDto.staListDto();
                                    staListDto.setStaNo(staNo);
                                    staListDto.setStaName(Utils.getStaName(staNo));
                                    maps.add(staListDto);
                                }
                                locDto.setStaNos(maps);
@@ -480,7 +387,7 @@

            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }
@@ -499,14 +406,14 @@
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();
        Set<ExistDto> existDtos = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
            if (!Cools.isEmpty(amount)) {
                if (amount > issued) {
                    return R.error("数量高于可出库数量");
@@ -517,7 +424,7 @@
                continue;
            }
            List<LocDetl> locDetls = new ArrayList<>();
            locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
            locDetls = locDetlService.queryStockMinAnfme(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
            for (LocDetl locDetl : locDetls) {
                if (issued > 0) {
                    ExistDto existDto = new ExistDto();
@@ -525,14 +432,13 @@
                    existDto.setMatnr(locDetl.getMatnr());
                    existDto.setBatch(locDetl.getBatch());
                    if (existDtos.add(existDto)) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetlPakout.getOrderNo(),
                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        List<LocDto.staListDto> maps = new ArrayList<>();
                        for (Integer staNo : staNos) {
                            LocDto.staListDto staListDto = new LocDto.staListDto();
                            staListDto.setStaNo(staNo);
                            staListDto.setStaName(Utils.getStaName(staNo));
                            maps.add(staListDto);
                        }
                        locDto.setStaNos(maps);
@@ -545,7 +451,7 @@
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }
@@ -559,19 +465,19 @@
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();
        Set<ExistDto> existDtos = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
            if (issued <= 0.0D) {
                continue;
            }
            List<LocDetl> locDetls = new ArrayList<>();
            locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
            locDetls = locDetlService.queryStockMinAnfme(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
            for (LocDetl locDetl : locDetls) {
                if (issued > 0) {
                    ExistDto existDto = new ExistDto();
@@ -579,14 +485,13 @@
                    existDto.setMatnr(locDetl.getMatnr());
                    existDto.setBatch(locDetl.getBatch());
                    if (existDtos.add(existDto)) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetlPakout.getOrderNo(),
                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        List<LocDto.staListDto> maps = new ArrayList<>();
                        for (Integer staNo : staNos) {
                            LocDto.staListDto staListDto = new LocDto.staListDto();
                            staListDto.setStaNo(staNo);
                            staListDto.setStaName(Utils.getStaName(staNo));
                            maps.add(staListDto);
                        }
                        locDto.setStaNos(maps);
@@ -599,7 +504,7 @@
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }
@@ -618,14 +523,14 @@
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();
        Set<ExistDto> existDtos = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
            if (!Cools.isEmpty(amount)) {
                if (amount > issued) {
                    return R.error("数量高于可出库数量");
@@ -636,7 +541,7 @@
                continue;
            }
            List<LocDetl> locDetls = new ArrayList<>();
            locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
            locDetls = locDetlService.queryStockCrn(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
            for (LocDetl locDetl : locDetls) {
                if (issued > 0) {
                    ExistDto existDto = new ExistDto();
@@ -644,14 +549,13 @@
                    existDto.setMatnr(locDetl.getMatnr());
                    existDto.setBatch(locDetl.getBatch());
                    if (existDtos.add(existDto)) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetlPakout.getOrderNo(),
                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        List<LocDto.staListDto> maps = new ArrayList<>();
                        for (Integer staNo : staNos) {
                            LocDto.staListDto staListDto = new LocDto.staListDto();
                            staListDto.setStaNo(staNo);
                            staListDto.setStaName(Utils.getStaName(staNo));
                            maps.add(staListDto);
                        }
                        locDto.setStaNos(maps);
@@ -664,7 +568,7 @@
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }
@@ -678,19 +582,19 @@
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();
        Set<ExistDto> existDtos = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
            if (issued <= 0.0D) {
                continue;
            }
            List<LocDetl> locDetls = new ArrayList<>();
            locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
            locDetls = locDetlService.queryStockCrn(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
            for (LocDetl locDetl : locDetls) {
                if (issued > 0) {
                    ExistDto existDto = new ExistDto();
@@ -698,14 +602,13 @@
                    existDto.setMatnr(locDetl.getMatnr());
                    existDto.setBatch(locDetl.getBatch());
                    if (existDtos.add(existDto)) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetlPakout.getOrderNo(),
                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        List<LocDto.staListDto> maps = new ArrayList<>();
                        for (Integer staNo : staNos) {
                            LocDto.staListDto staListDto = new LocDto.staListDto();
                            staListDto.setStaNo(staNo);
                            staListDto.setStaName(Utils.getStaName(staNo));
                            maps.add(staListDto);
                        }
                        locDto.setStaNos(maps);
@@ -718,7 +621,7 @@
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }

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

File was deleted

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

New file
@@ -0,0 +1,129 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.Task;
import com.zy.asrs.service.TaskService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
public class TaskController extends BaseController {

    @Autowired
    private TaskService taskService;

    @RequestMapping(value = "/task/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(taskService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/task/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<Task> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(Task.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(taskService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/task/add/auth")
    @ManagerAuth
    public R add(Task task) {
        taskService.insert(task);
        return R.ok();
    }

    @RequestMapping(value = "/task/update/auth")
    @ManagerAuth
    public R update(Task task) {
        if (Cools.isEmpty(task) || null == task.getId()) {
            return R.error();
        }
        taskService.updateById(task);
        return R.ok();
    }

    @RequestMapping(value = "/task/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            taskService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/task/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<Task> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("task"));
        convert(map, wrapper);
        List<Task> list = taskService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/taskQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Task> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<Task> page = taskService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Task task : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", task.getId());
            map.put("value", task.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/task/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<Task> wrapper = new EntityWrapper<Task>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != taskService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(Task.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

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

New file
@@ -0,0 +1,129 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.TaskDetl;
import com.zy.asrs.service.TaskDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
public class TaskDetlController extends BaseController {

    @Autowired
    private TaskDetlService taskDetlService;

    @RequestMapping(value = "/taskDetl/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(taskDetlService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/taskDetl/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<TaskDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(TaskDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(taskDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/taskDetl/add/auth")
    @ManagerAuth
    public R add(TaskDetl taskDetl) {
        taskDetlService.insert(taskDetl);
        return R.ok();
    }

    @RequestMapping(value = "/taskDetl/update/auth")
    @ManagerAuth
    public R update(TaskDetl taskDetl) {
        if (Cools.isEmpty(taskDetl) || null == taskDetl.getId()) {
            return R.error();
        }
        taskDetlService.updateById(taskDetl);
        return R.ok();
    }

    @RequestMapping(value = "/taskDetl/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            taskDetlService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/taskDetl/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<TaskDetl> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("taskDetl"));
        convert(map, wrapper);
        List<TaskDetl> list = taskDetlService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/taskDetlQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<TaskDetl> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<TaskDetl> page = taskDetlService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (TaskDetl taskDetl : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", taskDetl.getId());
            map.put("value", taskDetl.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/taskDetl/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<TaskDetl> wrapper = new EntityWrapper<TaskDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != taskDetlService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(TaskDetl.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

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

New file
@@ -0,0 +1,129 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.TaskDetlLog;
import com.zy.asrs.service.TaskDetlLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
public class TaskDetlLogController extends BaseController {

    @Autowired
    private TaskDetlLogService taskDetlLogService;

    @RequestMapping(value = "/taskDetlLog/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(taskDetlLogService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/taskDetlLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<TaskDetlLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(TaskDetlLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(taskDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/taskDetlLog/add/auth")
    @ManagerAuth
    public R add(TaskDetlLog taskDetlLog) {
        taskDetlLogService.insert(taskDetlLog);
        return R.ok();
    }

    @RequestMapping(value = "/taskDetlLog/update/auth")
    @ManagerAuth
    public R update(TaskDetlLog taskDetlLog) {
        if (Cools.isEmpty(taskDetlLog) || null == taskDetlLog.getId()) {
            return R.error();
        }
        taskDetlLogService.updateById(taskDetlLog);
        return R.ok();
    }

    @RequestMapping(value = "/taskDetlLog/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            taskDetlLogService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/taskDetlLog/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<TaskDetlLog> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("taskDetlLog"));
        convert(map, wrapper);
        List<TaskDetlLog> list = taskDetlLogService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/taskDetlLogQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<TaskDetlLog> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<TaskDetlLog> page = taskDetlLogService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (TaskDetlLog taskDetlLog : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", taskDetlLog.getId());
            map.put("value", taskDetlLog.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/taskDetlLog/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<TaskDetlLog> wrapper = new EntityWrapper<TaskDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != taskDetlLogService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(TaskDetlLog.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

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

New file
@@ -0,0 +1,129 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.TaskLog;
import com.zy.asrs.service.TaskLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
public class TaskLogController extends BaseController {

    @Autowired
    private TaskLogService taskLogService;

    @RequestMapping(value = "/taskLog/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(taskLogService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/taskLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<TaskLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(TaskLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(taskLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/taskLog/add/auth")
    @ManagerAuth
    public R add(TaskLog taskLog) {
        taskLogService.insert(taskLog);
        return R.ok();
    }

    @RequestMapping(value = "/taskLog/update/auth")
    @ManagerAuth
    public R update(TaskLog taskLog) {
        if (Cools.isEmpty(taskLog) || null == taskLog.getId()) {
            return R.error();
        }
        taskLogService.updateById(taskLog);
        return R.ok();
    }

    @RequestMapping(value = "/taskLog/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            taskLogService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/taskLog/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<TaskLog> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("taskLog"));
        convert(map, wrapper);
        List<TaskLog> list = taskLogService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/taskLogQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<TaskLog> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<TaskLog> page = taskLogService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (TaskLog taskLog : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", taskLog.getId());
            map.put("value", taskLog.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/taskLog/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<TaskLog> wrapper = new EntityWrapper<TaskLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != taskLogService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(TaskLog.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

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

@@ -13,7 +13,6 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -187,8 +186,6 @@
        if (param != null && param.getCrnNo() != null) {
            wrapper.eq("crn_no", param.getCrnNo());
        }
        // 不同继承角色显示不同库信息
//        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
        List<StaDesc> staDescs = staDescService.selectList(wrapper);
        for (StaDesc staDesc : staDescs) {
            if (staDesc.getCrnNo() == 1) {
@@ -196,11 +193,10 @@
            }
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", staDesc.getStnNo());
            map.put("desc", "[" + Utils.getStaName(staDesc.getStnNo()) + "]");
            map.put("desc", "[" + staDesc.getStnNo() + "]");
            result.add(map);
        }
        return R.ok().add(result);
//        return R.ok().add(basDevpService.getAvailableEmptyOutSite());
    }

    @RequestMapping("/full/store/put/start")

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

@@ -13,7 +13,6 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -191,7 +190,7 @@
            }
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", staDesc.getStnNo());
            map.put("desc", "[" + Utils.getStaName(staDesc.getStnNo()) + "]");
            map.put("desc", "[" + staDesc.getStnNo() + "]");
            result.add(map);
        }
        return R.ok().add(result);

 src/main/java/com/zy/asrs/entity/BasAreas.java

New file
@@ -0,0 +1,145 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWhsTypeService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("asr_bas_areas")
public class BasAreas implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "")
    @TableId(value = "id", type = IdType.INPUT)
    private Long id;

    /**
     * 仓库ID
     */
    @ApiModelProperty(value = "仓库ID")
    @TableField("whs_id")
    private Long whsId;

    /**
     * 仓库名称
     */
    @ApiModelProperty(value = "仓库名称")
    @TableField("whs_name")
    private String whsName;

    /**
     * 库区名称
     */
    @ApiModelProperty(value = "库区名称")
    private String name;

    /**
     * 仓库类型
     */
    @ApiModelProperty(value = "仓库类型")
    @TableField("whs_type_id")
    private Long whsTypeId;

    /**
     * 库区编码
     */
    @ApiModelProperty(value = "库区编码")
    @TableField("area_no")
    private String areaNo;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @TableField("create_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("update_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 创建人员
     */
    @ApiModelProperty(value = "创建人员")
    @TableField("create_by")
    private String createBy;

    /**
     * 修改人员
     */
    @ApiModelProperty(value = "修改人员")
    @TableField("update_by")
    private String updateBy;

    public BasAreas() {
    }

    public BasAreas(Long id, Long whsId, String whsName, String name, Long whsTypeId, String areaNo, Date createTime, Date updateTime, String createBy, String updateBy) {
        this.id = id;
        this.whsId = whsId;
        this.whsName = whsName;
        this.name = name;
        this.whsTypeId = whsTypeId;
        this.areaNo = areaNo;
        this.createTime = createTime;
        this.updateTime = updateTime;
        this.createBy = createBy;
        this.updateBy = updateBy;
    }

//    BasAreas basAreas = new BasAreas(
//            null,    // [非空]
//            null,    // 仓库ID
//            null,    // 仓库名称
//            null,    // 库区名称
//            null,    // 仓库类型
//            null,    // 库区编码
//            null,    // 创建时间
//            null,    // 修改时间
//            null,    // 创建人员
//            null    // 修改人员
//    );

    public String getWhsTypeId$() {
        BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
        BasWhsType basWhsType = service.selectById(this.whsTypeId);
        if (!Cools.isEmpty(basWhsType)) {
            return String.valueOf(basWhsType.getWhsDesc());
        }
        return null;
    }

    public String getCreateTime$() {
        if (Cools.isEmpty(this.createTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getUpdateTime$() {
        if (Cools.isEmpty(this.updateTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }


}

 src/main/java/com/zy/asrs/entity/BasStation.java

New file
@@ -0,0 +1,379 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("agv_bas_station")
public class BasStation implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 编号
     */
    @ApiModelProperty(value = "编号")
    @TableField("dev_no")
    private Integer devNo;

    /**
     * 设备描述
     */
    @ApiModelProperty(value = "设备描述")
    @TableField("dec_desc")
    private String decDesc;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    @TableField("dev_mk")
    private String devMk;

    /**
     * 可入(checkBox)
     */
    @ApiModelProperty(value = "可入(checkBox)")
    @TableField("in_enable")
    private String inEnable;

    /**
     * 可出(checkBox)
     */
    @ApiModelProperty(value = "可出(checkBox)")
    @TableField("out_enable")
    private String outEnable;

    /**
     * 自动(checkBox)
     */
    @ApiModelProperty(value = "自动(checkBox)")
    private String autoing;

    /**
     * 有物(checkBox)
     */
    @ApiModelProperty(value = "有物(checkBox)")
    private String loading;

    @ApiModelProperty(value = "")
    @TableField("loc_sts")
    private String locSts;

    /**
     * 能入(checkBox)
     */
    @ApiModelProperty(value = "能入(checkBox)")
    private String canining;

    /**
     * 能出(checkBox)
     */
    @ApiModelProperty(value = "能出(checkBox)")
    private String canouting;

    @ApiModelProperty(value = "")
    private String fronting;

    @ApiModelProperty(value = "")
    private String rearing;

    @ApiModelProperty(value = "")
    private String uping;

    @ApiModelProperty(value = "")
    private String downing;

    /**
     * 工作号
     */
    @ApiModelProperty(value = "工作号")
    @TableField("wrk_no")
    private Integer wrkNo;

    /**
     * 容器类型
     */
    @ApiModelProperty(value = "容器类型")
    @TableField("ctn_type")
    private Integer ctnType;

    /**
     * 条形码
     */
    @ApiModelProperty(value = "条形码")
    private String barcode;

    @ApiModelProperty(value = "")
    @TableField("in_qty")
    private Integer inQty;

    @ApiModelProperty(value = "")
    private Integer row1;

    @ApiModelProperty(value = "")
    @TableField("io_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date ioTime;

    @ApiModelProperty(value = "")
    private String area;

    @ApiModelProperty(value = "")
    @TableField("in_ok")
    private String inOk;

    @ApiModelProperty(value = "")
    @TableField("out_ok")
    private String outOk;

    /**
     * 高低类型 0: 未知  1: 低库位  2: 高库位
     */
    @ApiModelProperty(value = "高低类型 0: 未知  1: 低库位  2: 高库位  ")
    @TableField("loc_type1")
    private Short locType1;

    /**
     * 宽窄类型 0: 未知  1: 窄库位  2: 宽库位
     */
    @ApiModelProperty(value = "宽窄类型 0: 未知  1: 窄库位  2: 宽库位  ")
    @TableField("loc_type2")
    private Short locType2;

    /**
     * 轻重类型 0: 未知  1: 轻库位  2: 重库位
     */
    @ApiModelProperty(value = "轻重类型 0: 未知  1: 轻库位  2: 重库位  ")
    @TableField("loc_type3")
    private Short locType3;

    /**
     * 修改人员
     */
    @ApiModelProperty(value = "修改人员")
    @TableField("modi_user")
    private Long modiUser;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("modi_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modiTime;

    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    @TableField("appe_user")
    private Long appeUser;

    /**
     * 添加时间
     */
    @ApiModelProperty(value = "添加时间")
    @TableField("appe_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date appeTime;

    @ApiModelProperty(value = "")
    @TableField("std_qty")
    private Double stdQty;

    @ApiModelProperty(value = "")
    @TableField("min_wt")
    private Double minWt;

    /**
     * 重量
     */
    @ApiModelProperty(value = "重量")
    @TableField("gross_wt")
    private Double grossWt;

    public BasStation() {
    }

    public BasStation(Integer devNo, String decDesc, String devMk, String inEnable, String outEnable, String autoing, String loading, String locSts, String canining, String canouting, String fronting, String rearing, String uping, String downing, Integer wrkNo, Integer ctnType, String barcode, Integer inQty, Integer row1, Date ioTime, String area, String inOk, String outOk, Short locType1, Short locType2, Short locType3, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Double stdQty, Double minWt, Double grossWt) {
        this.devNo = devNo;
        this.decDesc = decDesc;
        this.devMk = devMk;
        this.inEnable = inEnable;
        this.outEnable = outEnable;
        this.autoing = autoing;
        this.loading = loading;
        this.locSts = locSts;
        this.canining = canining;
        this.canouting = canouting;
        this.fronting = fronting;
        this.rearing = rearing;
        this.uping = uping;
        this.downing = downing;
        this.wrkNo = wrkNo;
        this.ctnType = ctnType;
        this.barcode = barcode;
        this.inQty = inQty;
        this.row1 = row1;
        this.ioTime = ioTime;
        this.area = area;
        this.inOk = inOk;
        this.outOk = outOk;
        this.locType1 = locType1;
        this.locType2 = locType2;
        this.locType3 = locType3;
        this.modiUser = modiUser;
        this.modiTime = modiTime;
        this.appeUser = appeUser;
        this.appeTime = appeTime;
        this.stdQty = stdQty;
        this.minWt = minWt;
        this.grossWt = grossWt;
    }

//    BasStation basStation = new BasStation(
//            null,    // 编号[非空]
//            null,    // 设备描述
//            null,    // 备注
//            null,    // 可入(checkBox)
//            null,    // 可出(checkBox)
//            null,    // 自动(checkBox)
//            null,    // 有物(checkBox)
//            null,    // 
//            null,    // 能入(checkBox)
//            null,    // 能出(checkBox)
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 工作号
//            null,    // 容器类型
//            null,    // 条形码
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 高低类型
//            null,    // 宽窄类型
//            null,    // 轻重类型
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 创建者
//            null,    // 添加时间
//            null,    // 
//            null,    // 
//            null    // 重量
//    );

    public String getIoTime$() {
        if (Cools.isEmpty(this.ioTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }

    public String getLocType1$() {
        if (null == this.locType1) {
            return null;
        }
        switch (this.locType1) {
            case 0:
                return "未知";
            case 1:
                return "低库位";
            case 2:
                return "高库位";
            default:
                return String.valueOf(this.locType1);
        }
    }

    public String getLocType2$() {
        if (null == this.locType2) {
            return null;
        }
        switch (this.locType2) {
            case 0:
                return "未知";
            case 1:
                return "窄库位";
            case 2:
                return "宽库位";
            default:
                return String.valueOf(this.locType2);
        }
    }

    public String getLocType3$() {
        if (null == this.locType3) {
            return null;
        }
        switch (this.locType3) {
            case 0:
                return "未知";
            case 1:
                return "轻库位";
            case 2:
                return "重库位";
            default:
                return String.valueOf(this.locType3);
        }
    }

    public String getModiUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getModiTime$() {
        if (Cools.isEmpty(this.modiTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAppeUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getAppeTime$() {
        if (Cools.isEmpty(this.appeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }


}

 src/main/java/com/zy/asrs/entity/BasWhsType.java

File was renamed from src/main/java/com/zy/asrs/entity/BasWhs.java
@@ -14,8 +14,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;

@TableName("asr_bas_whs")
public class BasWhs implements Serializable {
@TableName("asr_bas_whs_type")
public class BasWhsType implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -23,7 +23,7 @@
     * 编号
     */
    @ApiModelProperty(value = "编号")

    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
@@ -65,13 +65,12 @@
     * 标识
     */
    @ApiModelProperty(value = "标识")
    @TableId(value = "identifying", type = IdType.AUTO)
    private String identifying;

    public BasWhs() {
    public BasWhsType() {
    }

    public BasWhs(String whsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
    public BasWhsType(String whsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
        this.whsDesc = whsDesc;
        this.modiUser = modiUser;
        this.modiTime = modiTime;

 src/main/java/com/zy/asrs/entity/LocCache.java

New file
@@ -0,0 +1,331 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("asr_loc_cache")
public class LocCache implements Serializable {

    private static final long serialVersionUID = 1L;


    @ApiModelProperty("主键ID")
    @TableId
    private Long id;

    /**
     * 库位号
     */
    @ApiModelProperty(value = "库位号")
    @TableField("loc_no")
    private String locNo;

    /**
     * 库位类型
     */
    @ApiModelProperty(value = "库位类型")
    @TableField("whs_type")
    private Long whsType;

    @ApiModelProperty(value = "")
    @TableField("loc_sts")
    private String locSts;

    /**
     * 排
     */
    @ApiModelProperty(value = "排")
    private Integer row1;

    /**
     * 列
     */
    @ApiModelProperty(value = "列")
    private Integer bay1;

    /**
     * 层
     */
    @ApiModelProperty(value = "层")
    private Integer lev1;

    /**
     * 满板(checkBox)
     */
    @ApiModelProperty(value = "满板(checkBox)")
    @TableField("full_plt")
    private String fullPlt;

    /**
     * 库位状态
     */
    @ApiModelProperty(value = "库位状态")
    @TableField("loc_type")
    private String locType;

    /**
     * 高低类型 0: 未知  1: 低库位  2: 高库位
     */
    @ApiModelProperty(value = "高低类型 0: 未知  1: 低库位  2: 高库位  ")
    @TableField("loc_type1")
    private Short locType1;

    /**
     * 宽窄类型 0: 未知  1: 窄库位  2: 宽库位
     */
    @ApiModelProperty(value = "宽窄类型 0: 未知  1: 窄库位  2: 宽库位  ")
    @TableField("loc_type2")
    private Short locType2;

    /**
     * 轻重类型 0: 未知  1: 轻库位  2: 重库位
     */
    @ApiModelProperty(value = "轻重类型 0: 未知  1: 轻库位  2: 重库位  ")
    @TableField("loc_type3")
    private Short locType3;

    @ApiModelProperty(value = "")
    @TableField("out_enable")
    private String outEnable;

    @ApiModelProperty(value = "")
    @TableField("io_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date ioTime;

    @ApiModelProperty(value = "")
    @TableField("first_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date firstTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value = "修改人员")
    @TableField("modi_user")
    private Long modiUser;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("modi_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modiTime;

    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    @TableField("appe_user")
    private Long appeUser;

    /**
     * 添加时间
     */
    @ApiModelProperty(value = "添加时间")
    @TableField("appe_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date appeTime;

    @ApiModelProperty(value = "")
    private String barcode;

    @ApiModelProperty("库区ID")
    @TableField("area_id")
    private Long areaId;

    @ApiModelProperty("库区名称")
    @TableField("area_name")
    private String areaName;

    @ApiModelProperty("优先级")
    private Integer sort;

    /**
     * 是否冻结,0.未冻结，1.已冻结
     */
    @ApiModelProperty(value = "是否冻结,0.未冻结，1.已冻结")
    private Integer frozen;

    /**
     * 冻结备注
     */
    @ApiModelProperty(value = "冻结备注")
    @TableField("frozen_memo")
    private String frozenMemo;

    public LocCache() {
    }

    public LocCache(String locNo, Long whsType, Integer pltType, Integer ctnType, String locSts, String sheetNo, Integer crnNo, Integer row1, Integer bay1, Integer lev1, String fullPlt, String locType, Short locType1, Short locType2, Short locType3, String outEnable, Date ioTime, Date firstTime, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Date errorTime, String errorMemo, Integer ctnKind, Double scWeight, String invWh, String mk, String barcode, String PdcType, String ctnNo, Integer libraryType, Integer gro1, Integer frozen, String frozenMemo) {
        this.locNo = locNo;
        this.whsType = whsType;
        this.locSts = locSts;
        this.row1 = row1;
        this.bay1 = bay1;
        this.lev1 = lev1;
        this.fullPlt = fullPlt;
        this.locType = locType;
        this.locType1 = locType1;
        this.locType2 = locType2;
        this.locType3 = locType3;
        this.outEnable = outEnable;
        this.ioTime = ioTime;
        this.firstTime = firstTime;
        this.modiUser = modiUser;
        this.modiTime = modiTime;
        this.appeUser = appeUser;
        this.appeTime = appeTime;
        this.barcode = barcode;
        this.frozen = frozen;
        this.frozenMemo = frozenMemo;
    }


    public String getWhsType$() {
        BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
        BasWhsType basWhsType = service.selectById(this.whsType);
        if (!Cools.isEmpty(basWhsType)) {
            return String.valueOf(basWhsType.getWhsDesc());
        }
        return null;
    }

    public String getLocSts$() {
        if (this.locSts.equals(LocStsType.LOC_STS_TYPE_F.type)) {
            return LocStsType.LOC_STS_TYPE_F.desc;
        } else if (locSts.equals(LocStsType.LOC_STS_TYPE_D.type)) {
            return LocStsType.LOC_STS_TYPE_D.desc;
        } else if (locSts.equals(LocStsType.LOC_STS_TYPE_O.type)) {
            return LocStsType.LOC_STS_TYPE_F.desc;
        } else if (locSts.equals(LocStsType.LOC_STS_TYPE_R.type)) {
            return LocStsType.LOC_STS_TYPE_R.desc;
        } else if (locSts.equals(LocStsType.LOC_STS_TYPE_S.type)) {
            return LocStsType.LOC_STS_TYPE_S.desc;
        } else if (locSts.equals(LocStsType.LOC_STS_TYPE_X.type)) {
            return LocStsType.LOC_STS_TYPE_X.desc;
        } else {
            return null;
        }
    }

//    public String getCrnNo$(){
//        BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
//        BasCrnp basCrnp = service.selectById(this.crnNo);
//        if (!Cools.isEmpty(basCrnp)){
//            return String.valueOf(basCrnp.getCrnNo());
//        }
//        return null;
//    }

    public String getLocType1$() {
        if (null == this.locType1) {
            return null;
        }
        switch (this.locType1) {
            case 0:
                return "未知";
            case 1:
                return "低库位";
            case 2:
                return "高库位";
            default:
                return String.valueOf(this.locType1);
        }
    }

    public String getLocType2$() {
        if (null == this.locType2) {
            return null;
        }
        switch (this.locType2) {
            case 0:
                return "未知";
            case 1:
                return "窄库位";
            case 2:
                return "宽库位";
            default:
                return String.valueOf(this.locType2);
        }
    }

    public String getLocType3$() {
        if (null == this.locType3) {
            return null;
        }
        switch (this.locType3) {
            case 0:
                return "未知";
            case 1:
                return "轻库位";
            case 2:
                return "重库位";
            default:
                return String.valueOf(this.locType3);
        }
    }

    public String getIoTime$() {
        if (Cools.isEmpty(this.ioTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }

    public String getFirstTime$() {
        if (Cools.isEmpty(this.firstTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
    }

    public String getModiUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getModiTime$() {
        if (Cools.isEmpty(this.modiTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAppeUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getAppeTime$() {
        if (Cools.isEmpty(this.appeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

}

 src/main/java/com/zy/asrs/entity/LocCheck.java

New file
@@ -0,0 +1,156 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("man_loc_check")
public class LocCheck implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 唯一ID
     */
    @ApiModelProperty(value = "唯一ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 状态 1: 盘点中  2: 盘点结束
     */
    @ApiModelProperty(value = "状态 1: 盘点中  2: 盘点结束  ")
    private Integer type;

    /**
     * 库位号
     */
    @ApiModelProperty(value = "库位号")
    @TableField("loc_no")
    private String locNo;

    /**
     * 物料号
     */
    @ApiModelProperty(value = "物料号")
    private String matnr;

    /**
     * 盘点前数量
     */
    @ApiModelProperty(value = "盘点前数量")
    @TableField("origin_anfme")
    private Double originAnfme;

    /**
     * 真实数量
     */
    @ApiModelProperty(value = "真实数量")
    @TableField("real_anfme")
    private Double realAnfme;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    @TableField("create_by")
    private Long createBy;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @TableField("create_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 修改人
     */
    @ApiModelProperty(value = "修改人")
    @TableField("update_by")
    private Long updateBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("update_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String memo;

    public LocCheck() {
    }

    public LocCheck(Integer type, String locNo, String matnr, Double originAnfme, Double realAnfme, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.type = type;
        this.locNo = locNo;
        this.matnr = matnr;
        this.originAnfme = originAnfme;
        this.realAnfme = realAnfme;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    }

//    LocCheck locCheck = new LocCheck(
//            null,    // 状态
//            null,    // 库位号
//            null,    // 物料号
//            null,    // 盘点前数量
//            null,    // 真实数量
//            null,    // 创建人
//            null,    // 创建时间
//            null,    // 修改人
//            null,    // 修改时间
//            null    // 备注
//    );

    public String getType$() {
        if (null == this.type) {
            return null;
        }
        switch (this.type) {
            case 1:
                return "盘点中";
            case 2:
                return "盘点结束";
            default:
                return String.valueOf(this.type);
        }
    }

    public String getCreateTime$() {
        if (Cools.isEmpty(this.createTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getUpdateTime$() {
        if (Cools.isEmpty(this.updateTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }


}

 src/main/java/com/zy/asrs/entity/LocMast.java

@@ -7,7 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasLocStsService;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -184,8 +184,8 @@


    public String getWhsType$() {
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = service.selectById(this.whsType);
        BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
        BasWhsType basWhs = service.selectById(this.whsType);
        if (!Cools.isEmpty(basWhs)) {
            return String.valueOf(basWhs.getWhsDesc());
        }

 src/main/java/com/zy/asrs/entity/MatCodeCountDto.java

File was deleted

 src/main/java/com/zy/asrs/entity/MatCodePrint.java

File was deleted

 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java

File was renamed from src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -19,8 +19,8 @@
import java.util.Date;

@Data
@TableName("man_order_detl")
public class OrderDetl implements Serializable {
@TableName("man_order_detl_pakin")
public class OrderDetlPakin implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -304,10 +304,10 @@
    @ApiModelProperty(value = "预留1")
    private String temp4;

    public OrderDetl() {
    public OrderDetlPakin() {
    }

    public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderDetlPakin(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.orderId = orderId;
        this.orderNo = orderNo;
        this.anfme = anfme;
@@ -351,7 +351,7 @@

    public String getOrderId$() {
        OrderService service = SpringUtils.getBean(OrderService.class);
        Order order = service.selectById(this.orderId);
        OrderPakin order = service.selectById(this.orderId);
        if (!Cools.isEmpty(order)) {
            return String.valueOf(order.getId());
        }

 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java

copy from src/main/java/com/zy/asrs/entity/OrderDetl.java
copy to src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
File was copied from src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -19,8 +19,8 @@
import java.util.Date;

@Data
@TableName("man_order_detl")
public class OrderDetl implements Serializable {
@TableName("man_order_detl_pakout")
public class OrderDetlPakout implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -304,10 +304,10 @@
    @ApiModelProperty(value = "预留1")
    private String temp4;

    public OrderDetl() {
    public OrderDetlPakout() {
    }

    public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderDetlPakout(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.orderId = orderId;
        this.orderNo = orderNo;
        this.anfme = anfme;
@@ -351,7 +351,7 @@

    public String getOrderId$() {
        OrderService service = SpringUtils.getBean(OrderService.class);
        Order order = service.selectById(this.orderId);
        OrderPakin order = service.selectById(this.orderId);
        if (!Cools.isEmpty(order)) {
            return String.valueOf(order.getId());
        }

 src/main/java/com/zy/asrs/entity/OrderPakin.java

copy from src/main/java/com/zy/asrs/entity/Order.java
copy to src/main/java/com/zy/asrs/entity/OrderPakin.java
File was copied from src/main/java/com/zy/asrs/entity/Order.java
@@ -19,8 +19,8 @@
import java.util.Date;

@Data
@TableName("man_order")
public class Order implements Serializable {
@TableName("man_order_pakin")
public class OrderPakin implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -268,10 +268,10 @@
    @TableField("move_status")
    private Integer moveStatus;

    public Order() {
    public OrderPakin() {
    }

    public Order(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderPakin(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;

 src/main/java/com/zy/asrs/entity/OrderPakout.java

copy from src/main/java/com/zy/asrs/entity/Order.java
copy to src/main/java/com/zy/asrs/entity/OrderPakout.java
File was copied from src/main/java/com/zy/asrs/entity/Order.java
@@ -19,8 +19,8 @@
import java.util.Date;

@Data
@TableName("man_order")
public class Order implements Serializable {
@TableName("man_order_pakout")
public class OrderPakout implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -268,10 +268,10 @@
    @TableField("move_status")
    private Integer moveStatus;

    public Order() {
    public OrderPakout() {
    }

    public Order(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;

 src/main/java/com/zy/asrs/entity/OrderReport.java

File was renamed from src/main/java/com/zy/asrs/entity/Order.java
@@ -19,8 +19,8 @@
import java.util.Date;

@Data
@TableName("man_order")
public class Order implements Serializable {
@TableName("man_order_report")
public class OrderReport implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -268,10 +268,10 @@
    @TableField("move_status")
    private Integer moveStatus;

    public Order() {
    public OrderReport() {
    }

    public Order(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderReport(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;

 src/main/java/com/zy/asrs/entity/Pack.java

File was deleted

 src/main/java/com/zy/asrs/entity/PieChartsVo.java

File was deleted

 src/main/java/com/zy/asrs/entity/RequestLog.java

File was deleted

 src/main/java/com/zy/asrs/entity/RowLastno.java

@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.asrs.service.RowLastnoTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -387,8 +387,8 @@
    public String getTypeId$() {
        RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
        RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
        BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = basWhsService.selectOne(new EntityWrapper<BasWhs>().eq("identifying", rowLastnoType.getType().longValue()));
        BasWhsTypeService basWhsService = SpringUtils.getBean(BasWhsTypeService.class);
        BasWhsType basWhs = basWhsService.selectOne(new EntityWrapper<BasWhsType>().eq("identifying", rowLastnoType.getType().longValue()));
        if (!Cools.isEmpty(rowLastnoType)) {
            return rowLastnoType.getTypeName() + "<==>" + rowLastnoType.getMemo() + "<==>" + basWhs.getWhsDesc();
        }

 src/main/java/com/zy/asrs/entity/Task.java

New file
@@ -0,0 +1,41 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
@TableName("agv_task")
public class Task implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 任务类型： agv  , crn
     */
    @ApiModelProperty(value = "任务类型： agv  , crn")
    @TableField("task_type")
    private String taskType;

    public Task() {
    }

    public Task(String taskType) {
        this.taskType = taskType;
    }

//    Task task = new Task(
//            null    // 任务类型： agv  , crn
//    );


}

 src/main/java/com/zy/asrs/entity/TaskDetl.java

New file
@@ -0,0 +1,502 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("agv_task_detl")
public class TaskDetl implements Serializable {

    private static final long serialVersionUID = 1L;

    private Long id;

    /**
     * 工作号
     */
    @ApiModelProperty(value = "工作号")
    @TableField("wrk_no")
    private Integer wrkNo;

    /**
     * 工作时间
     */
    @ApiModelProperty(value = "工作时间")
    @TableField("io_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date ioTime;

    /**
     * 数量
     */
    @ApiModelProperty(value = "数量")
    private Double anfme;

    /**
     * 托盘条码
     */
    @ApiModelProperty(value = "托盘条码")
    private String zpallet;

    /**
     * 商品编号
     */
    @ApiModelProperty(value = "商品编号")
    private String matnr;

    /**
     * 商品名称
     */
    @ApiModelProperty(value = "商品名称")
    private String maktx;

    /**
     * 批号
     */
    @ApiModelProperty(value = "批号")
    private String batch;

    /**
     * 单据编号
     */
    @ApiModelProperty(value = "单据编号")
    @TableField("order_no")
    private String orderNo;

    /**
     * 规格
     */
    @ApiModelProperty(value = "规格")
    private String specs;

    /**
     * 型号
     */
    @ApiModelProperty(value = "型号")
    private String model;

    /**
     * 颜色
     */
    @ApiModelProperty(value = "颜色")
    private String color;

    /**
     * 品牌
     */
    @ApiModelProperty(value = "品牌")
    private String brand;

    /**
     * 单位
     */
    @ApiModelProperty(value = "单位")
    private String unit;

    /**
     * 单价
     */
    @ApiModelProperty(value = "单价")
    private Double price;

    /**
     * sku
     */
    @ApiModelProperty(value = "sku")
    private String sku;

    /**
     * 单位量
     */
    @ApiModelProperty(value = "单位量")
    private Double units;

    /**
     * 条码
     */
    @ApiModelProperty(value = "条码")
    private String barcode;

    /**
     * 产地
     */
    @ApiModelProperty(value = "产地")
    private String origin;

    /**
     * 厂家
     */
    @ApiModelProperty(value = "厂家")
    private String manu;

    /**
     * 生产日期
     */
    @ApiModelProperty(value = "生产日期")
    @TableField("manu_date")
    private String manuDate;

    /**
     * 品项数
     */
    @ApiModelProperty(value = "品项数")
    @TableField("item_num")
    private String itemNum;

    /**
     * 安全库存量
     */
    @ApiModelProperty(value = "安全库存量")
    @TableField("safe_qty")
    private Double safeQty;

    /**
     * 重量
     */
    @ApiModelProperty(value = "重量")
    private Double weight;

    /**
     * 长度
     */
    @ApiModelProperty(value = "长度")
    @TableField("man_length")
    private Double manLength;

    /**
     * 体积
     */
    @ApiModelProperty(value = "体积")
    private Double volume;

    /**
     * 三方编码
     */
    @ApiModelProperty(value = "三方编码")
    @TableField("three_code")
    private String threeCode;

    /**
     * 供应商
     */
    @ApiModelProperty(value = "供应商")
    private String supp;

    /**
     * 供应商编码
     */
    @ApiModelProperty(value = "供应商编码")
    @TableField("supp_code")
    private String suppCode;

    /**
     * 是否批次 1: 是  0: 否
     */
    @ApiModelProperty(value = "是否批次 1: 是  0: 否  ")
    @TableField("be_batch")
    private Integer beBatch;

    /**
     * 保质期
     */
    @ApiModelProperty(value = "保质期")
    @TableField("dead_time")
    private String deadTime;

    /**
     * 预警天数
     */
    @ApiModelProperty(value = "预警天数")
    @TableField("dead_warn")
    private Integer deadWarn;

    /**
     * 制购 1: 制造  2: 采购  3: 外协
     */
    @ApiModelProperty(value = "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;

    /**
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value = "要求检验 1: 是  0: 否  ")
    private Integer inspect;

    /**
     * 危险品 1: 是  0: 否
     */
    @ApiModelProperty(value = "危险品 1: 是  0: 否  ")
    private Integer danger;

    /**
     * 修改人员
     */
    @ApiModelProperty(value = "修改人员")
    @TableField("modi_user")
    private Long modiUser;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("modi_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modiTime;

    /**
     * 添加人员
     */
    @ApiModelProperty(value = "添加人员")
    @TableField("appe_user")
    private Long appeUser;

    /**
     * 添加时间
     */
    @ApiModelProperty(value = "添加时间")
    @TableField("appe_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date appeTime;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String memo;

    @ApiModelProperty(value = "")
    @TableField("line_number")
    private Long lineNumber;

    @ApiModelProperty(value = "")
    private String standby1;

    @ApiModelProperty(value = "")
    private String standby2;

    @ApiModelProperty(value = "")
    private String standby3;

    @ApiModelProperty(value = "")
    @TableField("box_type1")
    private String boxType1;

    @ApiModelProperty(value = "")
    @TableField("box_type2")
    private String boxType2;

    @ApiModelProperty(value = "")
    @TableField("box_type3")
    private String boxType3;

    public TaskDetl() {
    }

    public TaskDetl(Integer wrkNo, Date ioTime, Double anfme, String zpallet, String matnr, String maktx, String batch, String orderNo, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String memo, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
        this.wrkNo = wrkNo;
        this.ioTime = ioTime;
        this.anfme = anfme;
        this.zpallet = zpallet;
        this.matnr = matnr;
        this.maktx = maktx;
        this.batch = batch;
        this.orderNo = orderNo;
        this.specs = specs;
        this.model = model;
        this.color = color;
        this.brand = brand;
        this.unit = unit;
        this.price = price;
        this.sku = sku;
        this.units = units;
        this.barcode = barcode;
        this.origin = origin;
        this.manu = manu;
        this.manuDate = manuDate;
        this.itemNum = itemNum;
        this.safeQty = safeQty;
        this.weight = weight;
        this.manLength = manLength;
        this.volume = volume;
        this.threeCode = threeCode;
        this.supp = supp;
        this.suppCode = suppCode;
        this.beBatch = beBatch;
        this.deadTime = deadTime;
        this.deadWarn = deadWarn;
        this.source = source;
        this.inspect = inspect;
        this.danger = danger;
        this.modiUser = modiUser;
        this.modiTime = modiTime;
        this.appeUser = appeUser;
        this.appeTime = appeTime;
        this.memo = memo;
        this.lineNumber = lineNumber;
        this.standby1 = standby1;
        this.standby2 = standby2;
        this.standby3 = standby3;
        this.boxType1 = boxType1;
        this.boxType2 = boxType2;
        this.boxType3 = boxType3;
    }

//    TaskDetl taskDetl = new TaskDetl(
//            null,    // 工作号[非空]
//            null,    // 工作时间
//            null,    // 数量
//            null,    // 托盘条码
//            null,    // 商品编号[非空]
//            null,    // 商品名称
//            null,    // 批号
//            null,    // 单据编号
//            null,    // 规格
//            null,    // 型号
//            null,    // 颜色
//            null,    // 品牌
//            null,    // 单位
//            null,    // 单价
//            null,    // sku
//            null,    // 单位量
//            null,    // 条码
//            null,    // 产地
//            null,    // 厂家
//            null,    // 生产日期
//            null,    // 品项数
//            null,    // 安全库存量
//            null,    // 重量
//            null,    // 长度
//            null,    // 体积
//            null,    // 三方编码
//            null,    // 供应商
//            null,    // 供应商编码
//            null,    // 是否批次
//            null,    // 保质期
//            null,    // 预警天数
//            null,    // 制购
//            null,    // 要求检验
//            null,    // 危险品
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 添加人员
//            null,    // 添加时间
//            null,    // 备注
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null    // 
//    );

    public String getIoTime$() {
        if (Cools.isEmpty(this.ioTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }

    public String getBeBatch$() {
        if (null == this.beBatch) {
            return null;
        }
        switch (this.beBatch) {
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.beBatch);
        }
    }

    public String getSource$() {
        if (null == this.source) {
            return null;
        }
        switch (this.source) {
            case 1:
                return "制造";
            case 2:
                return "采购";
            case 3:
                return "外协";
            default:
                return String.valueOf(this.source);
        }
    }

    public String getInspect$() {
        if (null == this.inspect) {
            return null;
        }
        switch (this.inspect) {
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.inspect);
        }
    }

    public String getDanger$() {
        if (null == this.danger) {
            return null;
        }
        switch (this.danger) {
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.danger);
        }
    }

    public String getModiUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getModiTime$() {
        if (Cools.isEmpty(this.modiTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAppeUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getAppeTime$() {
        if (Cools.isEmpty(this.appeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }


}

 src/main/java/com/zy/asrs/entity/TaskDetlLog.java

New file
@@ -0,0 +1,505 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("agv_task_detl_log")
public class TaskDetlLog implements Serializable {

    private static final long serialVersionUID = 1L;

    private Long id;

    @TableField("log_id")
    private Long logId;

    /**
     * 工作号
     */
    @ApiModelProperty(value = "工作号")
    @TableField("wrk_no")
    private Integer wrkNo;

    /**
     * 工作时间
     */
    @ApiModelProperty(value = "工作时间")
    @TableField("io_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date ioTime;

    /**
     * 数量
     */
    @ApiModelProperty(value = "数量")
    private Double anfme;

    /**
     * 托盘条码
     */
    @ApiModelProperty(value = "托盘条码")
    private String zpallet;

    /**
     * 商品编号
     */
    @ApiModelProperty(value = "商品编号")
    private String matnr;

    /**
     * 商品名称
     */
    @ApiModelProperty(value = "商品名称")
    private String maktx;

    /**
     * 批号
     */
    @ApiModelProperty(value = "批号")
    private String batch;

    /**
     * 单据编号
     */
    @ApiModelProperty(value = "单据编号")
    @TableField("order_no")
    private String orderNo;

    /**
     * 规格
     */
    @ApiModelProperty(value = "规格")
    private String specs;

    /**
     * 型号
     */
    @ApiModelProperty(value = "型号")
    private String model;

    /**
     * 颜色
     */
    @ApiModelProperty(value = "颜色")
    private String color;

    /**
     * 品牌
     */
    @ApiModelProperty(value = "品牌")
    private String brand;

    /**
     * 单位
     */
    @ApiModelProperty(value = "单位")
    private String unit;

    /**
     * 单价
     */
    @ApiModelProperty(value = "单价")
    private Double price;

    /**
     * sku
     */
    @ApiModelProperty(value = "sku")
    private String sku;

    /**
     * 单位量
     */
    @ApiModelProperty(value = "单位量")
    private Double units;

    /**
     * 条码
     */
    @ApiModelProperty(value = "条码")
    private String barcode;

    /**
     * 产地
     */
    @ApiModelProperty(value = "产地")
    private String origin;

    /**
     * 厂家
     */
    @ApiModelProperty(value = "厂家")
    private String manu;

    /**
     * 生产日期
     */
    @ApiModelProperty(value = "生产日期")
    @TableField("manu_date")
    private String manuDate;

    /**
     * 品项数
     */
    @ApiModelProperty(value = "品项数")
    @TableField("item_num")
    private String itemNum;

    /**
     * 安全库存量
     */
    @ApiModelProperty(value = "安全库存量")
    @TableField("safe_qty")
    private Double safeQty;

    /**
     * 重量
     */
    @ApiModelProperty(value = "重量")
    private Double weight;

    /**
     * 长度
     */
    @ApiModelProperty(value = "长度")
    @TableField("man_length")
    private Double manLength;

    /**
     * 体积
     */
    @ApiModelProperty(value = "体积")
    private Double volume;

    /**
     * 三方编码
     */
    @ApiModelProperty(value = "三方编码")
    @TableField("three_code")
    private String threeCode;

    /**
     * 供应商
     */
    @ApiModelProperty(value = "供应商")
    private String supp;

    /**
     * 供应商编码
     */
    @ApiModelProperty(value = "供应商编码")
    @TableField("supp_code")
    private String suppCode;

    /**
     * 是否批次 1: 是  0: 否
     */
    @ApiModelProperty(value = "是否批次 1: 是  0: 否  ")
    @TableField("be_batch")
    private Integer beBatch;

    /**
     * 保质期
     */
    @ApiModelProperty(value = "保质期")
    @TableField("dead_time")
    private String deadTime;

    /**
     * 预警天数
     */
    @ApiModelProperty(value = "预警天数")
    @TableField("dead_warn")
    private Integer deadWarn;

    /**
     * 制购 1: 制造  2: 采购  3: 外协
     */
    @ApiModelProperty(value = "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;

    /**
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value = "要求检验 1: 是  0: 否  ")
    private Integer inspect;

    /**
     * 危险品 1: 是  0: 否
     */
    @ApiModelProperty(value = "危险品 1: 是  0: 否  ")
    private Integer danger;

    /**
     * 修改人员
     */
    @ApiModelProperty(value = "修改人员")
    @TableField("modi_user")
    private Long modiUser;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("modi_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modiTime;

    /**
     * 添加人员
     */
    @ApiModelProperty(value = "添加人员")
    @TableField("appe_user")
    private Long appeUser;

    /**
     * 添加时间
     */
    @ApiModelProperty(value = "添加时间")
    @TableField("appe_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date appeTime;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String memo;

    @ApiModelProperty(value = "")
    @TableField("line_number")
    private Long lineNumber;

    @ApiModelProperty(value = "")
    private String standby1;

    @ApiModelProperty(value = "")
    private String standby2;

    @ApiModelProperty(value = "")
    private String standby3;

    @ApiModelProperty(value = "")
    @TableField("box_type1")
    private String boxType1;

    @ApiModelProperty(value = "")
    @TableField("box_type2")
    private String boxType2;

    @ApiModelProperty(value = "")
    @TableField("box_type3")
    private String boxType3;

    public TaskDetlLog() {
    }

    public TaskDetlLog(Integer wrkNo, Date ioTime, Double anfme, String zpallet, String matnr, String maktx, String batch, String orderNo, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String memo, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
        this.wrkNo = wrkNo;
        this.ioTime = ioTime;
        this.anfme = anfme;
        this.zpallet = zpallet;
        this.matnr = matnr;
        this.maktx = maktx;
        this.batch = batch;
        this.orderNo = orderNo;
        this.specs = specs;
        this.model = model;
        this.color = color;
        this.brand = brand;
        this.unit = unit;
        this.price = price;
        this.sku = sku;
        this.units = units;
        this.barcode = barcode;
        this.origin = origin;
        this.manu = manu;
        this.manuDate = manuDate;
        this.itemNum = itemNum;
        this.safeQty = safeQty;
        this.weight = weight;
        this.manLength = manLength;
        this.volume = volume;
        this.threeCode = threeCode;
        this.supp = supp;
        this.suppCode = suppCode;
        this.beBatch = beBatch;
        this.deadTime = deadTime;
        this.deadWarn = deadWarn;
        this.source = source;
        this.inspect = inspect;
        this.danger = danger;
        this.modiUser = modiUser;
        this.modiTime = modiTime;
        this.appeUser = appeUser;
        this.appeTime = appeTime;
        this.memo = memo;
        this.lineNumber = lineNumber;
        this.standby1 = standby1;
        this.standby2 = standby2;
        this.standby3 = standby3;
        this.boxType1 = boxType1;
        this.boxType2 = boxType2;
        this.boxType3 = boxType3;
    }

//    TaskDetlLog taskDetlLog = new TaskDetlLog(
//            null,    // 工作号[非空]
//            null,    // 工作时间
//            null,    // 数量
//            null,    // 托盘条码
//            null,    // 商品编号[非空]
//            null,    // 商品名称
//            null,    // 批号
//            null,    // 单据编号
//            null,    // 规格
//            null,    // 型号
//            null,    // 颜色
//            null,    // 品牌
//            null,    // 单位
//            null,    // 单价
//            null,    // sku
//            null,    // 单位量
//            null,    // 条码
//            null,    // 产地
//            null,    // 厂家
//            null,    // 生产日期
//            null,    // 品项数
//            null,    // 安全库存量
//            null,    // 重量
//            null,    // 长度
//            null,    // 体积
//            null,    // 三方编码
//            null,    // 供应商
//            null,    // 供应商编码
//            null,    // 是否批次
//            null,    // 保质期
//            null,    // 预警天数
//            null,    // 制购
//            null,    // 要求检验
//            null,    // 危险品
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 添加人员
//            null,    // 添加时间
//            null,    // 备注
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null    // 
//    );

    public String getIoTime$() {
        if (Cools.isEmpty(this.ioTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }

    public String getBeBatch$() {
        if (null == this.beBatch) {
            return null;
        }
        switch (this.beBatch) {
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.beBatch);
        }
    }

    public String getSource$() {
        if (null == this.source) {
            return null;
        }
        switch (this.source) {
            case 1:
                return "制造";
            case 2:
                return "采购";
            case 3:
                return "外协";
            default:
                return String.valueOf(this.source);
        }
    }

    public String getInspect$() {
        if (null == this.inspect) {
            return null;
        }
        switch (this.inspect) {
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.inspect);
        }
    }

    public String getDanger$() {
        if (null == this.danger) {
            return null;
        }
        switch (this.danger) {
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.danger);
        }
    }

    public String getModiUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getModiTime$() {
        if (Cools.isEmpty(this.modiTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAppeUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getAppeTime$() {
        if (Cools.isEmpty(this.appeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }


}

 src/main/java/com/zy/asrs/entity/TaskLog.java

New file
@@ -0,0 +1,640 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("agv_task_log")
public class TaskLog implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "")
    private Long id;

    /**
     * 工作号
     */
    @ApiModelProperty(value = "工作号")
    @TableField("wrk_no")
    private Integer wrkNo;

    @ApiModelProperty(value = "")
    @TableField("log_id")
    private Long logId;

    @ApiModelProperty(value = "")
    @TableField("inv_wh")
    private String invWh;

    @ApiModelProperty(value = "")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date ymd;

    @ApiModelProperty(value = "")
    private String mk;

    @ApiModelProperty(value = "")
    @TableField("whs_type")
    private Integer whsType;

    /**
     * 工作状态
     */
    @ApiModelProperty(value = "工作状态")
    @TableField("wrk_sts")
    private Integer wrkSts;

    /**
     * 入出库类型
     */
    @ApiModelProperty(value = "入出库类型")
    @TableField("io_type")
    private Integer ioType;

    /**
     * 堆垛机号
     */
    @ApiModelProperty(value = "堆垛机号")
    @TableField("crn_no")
    private Integer crnNo;

    @ApiModelProperty(value = "")
    @TableField("sheet_no")
    private String sheetNo;

    /**
     * 优先级
     */
    @ApiModelProperty(value = "优先级")
    @TableField("io_pri")
    private Double ioPri;

    @ApiModelProperty(value = "")
    @TableField("wrk_date")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date wrkDate;

    /**
     * 目标库位
     */
    @ApiModelProperty(value = "目标库位")
    @TableField("loc_no")
    private String locNo;

    /**
     * 目标站
     */
    @ApiModelProperty(value = "目标站")
    @TableField("sta_no")
    private Integer staNo;

    /**
     * 源站
     */
    @ApiModelProperty(value = "源站")
    @TableField("source_sta_no")
    private Integer sourceStaNo;

    /**
     * 源库位
     */
    @ApiModelProperty(value = "源库位")
    @TableField("source_loc_no")
    private String sourceLocNo;

    @ApiModelProperty(value = "")
    @TableField("loc_sts")
    private String locSts;

    /**
     * 拣料(checkBox)
     */
    @ApiModelProperty(value = "拣料(checkBox)")
    private String picking;

    @ApiModelProperty(value = "")
    @TableField("link_mis")
    private String linkMis;

    @ApiModelProperty(value = "")
    @TableField("online_yn")
    private String onlineYn;

    @ApiModelProperty(value = "")
    @TableField("upd_mk")
    private String updMk;

    /**
     * 退出(checkBox)
     */
    @ApiModelProperty(value = "退出(checkBox)")
    @TableField("exit_mk")
    private String exitMk;

    @ApiModelProperty(value = "")
    @TableField("plt_type")
    private Integer pltType;

    /**
     * 空板(checkBox)
     */
    @ApiModelProperty(value = "空板(checkBox)")
    @TableField("empty_mk")
    private String emptyMk;

    /**
     * 工作时间
     */
    @ApiModelProperty(value = "工作时间")
    @TableField("io_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date ioTime;

    @ApiModelProperty(value = "")
    @TableField("ctn_type")
    private Integer ctnType;

    @ApiModelProperty(value = "")
    private String packed;

    @ApiModelProperty(value = "")
    @TableField("ove_mk")
    private String oveMk;

    @ApiModelProperty(value = "")
    @TableField("mtn_type")
    private Double mtnType;

    @ApiModelProperty(value = "")
    @TableField("user_no")
    private String userNo;

    /**
     * 堆垛机启动时间
     */
    @ApiModelProperty(value = "堆垛机启动时间")
    @TableField("crn_str_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date crnStrTime;

    /**
     * 堆垛机停止时间
     */
    @ApiModelProperty(value = "堆垛机停止时间")
    @TableField("crn_end_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date crnEndTime;

    /**
     * 拣料时间
     */
    @ApiModelProperty(value = "拣料时间")
    @TableField("plc_str_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date plcStrTime;

    @ApiModelProperty(value = "")
    @TableField("crn_pos_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date crnPosTime;

    @ApiModelProperty(value = "")
    @TableField("load_time")
    private Double loadTime;

    @ApiModelProperty(value = "")
    @TableField("exp_time")
    private Double expTime;

    @ApiModelProperty(value = "")
    @TableField("ref_wrkno")
    private Double refWrkno;

    @ApiModelProperty(value = "")
    @TableField("ref_iotime")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date refIotime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value = "修改人员")
    @TableField("modi_user")
    private Long modiUser;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("modi_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modiTime;

    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    @TableField("appe_user")
    private Long appeUser;

    /**
     * 添加时间
     */
    @ApiModelProperty(value = "添加时间")
    @TableField("appe_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date appeTime;

    @ApiModelProperty(value = "")
    @TableField("pause_mk")
    private String pauseMk;

    @ApiModelProperty(value = "")
    @TableField("error_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date errorTime;

    @ApiModelProperty(value = "")
    @TableField("error_memo")
    private String errorMemo;

    @ApiModelProperty(value = "")
    @TableField("ctn_kind")
    private Integer ctnKind;

    @ApiModelProperty(value = "")
    @TableField("manu_type")
    private String manuType;

    @ApiModelProperty(value = "")
    @TableField("memo_m")
    private String memoM;

    @ApiModelProperty(value = "")
    @TableField("sc_weight")
    private Double scWeight;

    @ApiModelProperty(value = "")
    @TableField("log_mk")
    private String logMk;

    @ApiModelProperty(value = "")
    @TableField("log_err_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date logErrTime;

    @ApiModelProperty(value = "")
    @TableField("log_err_memo")
    private String logErrMemo;

    /**
     * 条码
     */
    @ApiModelProperty(value = "条码")
    private String barcode;

    @ApiModelProperty(value = "")
    @TableField("Pdc_type")
    private String PdcType;

    @ApiModelProperty(value = "")
    @TableField("ctn_no")
    private String ctnNo;

    /**
     * 满板(checkBox)
     */
    @ApiModelProperty(value = "满板(checkBox)")
    @TableField("full_plt")
    private String fullPlt;

    @ApiModelProperty(value = "")
    @TableField("pre_have")
    private String preHave;

    @ApiModelProperty(value = "")
    @TableField("take_none")
    private String takeNone;

    @ApiModelProperty(value = "")
    @TableField("line_number")
    private Long lineNumber;

    public TaskLog() {
    }

    public TaskLog(Long id, Integer wrkNo, Long logId, String invWh, Date ymd, String mk, Integer whsType, Integer wrkSts, Integer ioType, Integer crnNo, String sheetNo, Double ioPri, Date wrkDate, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String locSts, String picking, String linkMis, String onlineYn, String updMk, String exitMk, Integer pltType, String emptyMk, Date ioTime, Integer ctnType, String packed, String oveMk, Double mtnType, String userNo, Date crnStrTime, Date crnEndTime, Date plcStrTime, Date crnPosTime, Double loadTime, Double expTime, Double refWrkno, Date refIotime, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String pauseMk, Date errorTime, String errorMemo, Integer ctnKind, String manuType, String memoM, Double scWeight, String logMk, Date logErrTime, String logErrMemo, String barcode, String PdcType, String ctnNo, String fullPlt, String preHave, String takeNone, Long lineNumber) {
        this.id = id;
        this.wrkNo = wrkNo;
        this.logId = logId;
        this.invWh = invWh;
        this.ymd = ymd;
        this.mk = mk;
        this.whsType = whsType;
        this.wrkSts = wrkSts;
        this.ioType = ioType;
        this.crnNo = crnNo;
        this.sheetNo = sheetNo;
        this.ioPri = ioPri;
        this.wrkDate = wrkDate;
        this.locNo = locNo;
        this.staNo = staNo;
        this.sourceStaNo = sourceStaNo;
        this.sourceLocNo = sourceLocNo;
        this.locSts = locSts;
        this.picking = picking;
        this.linkMis = linkMis;
        this.onlineYn = onlineYn;
        this.updMk = updMk;
        this.exitMk = exitMk;
        this.pltType = pltType;
        this.emptyMk = emptyMk;
        this.ioTime = ioTime;
        this.ctnType = ctnType;
        this.packed = packed;
        this.oveMk = oveMk;
        this.mtnType = mtnType;
        this.userNo = userNo;
        this.crnStrTime = crnStrTime;
        this.crnEndTime = crnEndTime;
        this.plcStrTime = plcStrTime;
        this.crnPosTime = crnPosTime;
        this.loadTime = loadTime;
        this.expTime = expTime;
        this.refWrkno = refWrkno;
        this.refIotime = refIotime;
        this.modiUser = modiUser;
        this.modiTime = modiTime;
        this.appeUser = appeUser;
        this.appeTime = appeTime;
        this.pauseMk = pauseMk;
        this.errorTime = errorTime;
        this.errorMemo = errorMemo;
        this.ctnKind = ctnKind;
        this.manuType = manuType;
        this.memoM = memoM;
        this.scWeight = scWeight;
        this.logMk = logMk;
        this.logErrTime = logErrTime;
        this.logErrMemo = logErrMemo;
        this.barcode = barcode;
        this.PdcType = PdcType;
        this.ctnNo = ctnNo;
        this.fullPlt = fullPlt;
        this.preHave = preHave;
        this.takeNone = takeNone;
        this.lineNumber = lineNumber;
    }

//    TaskLog taskLog = new TaskLog(
//            null,    // 
//            null,    // 工作号[非空]
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 工作状态
//            null,    // 入出库类型
//            null,    // 堆垛机号
//            null,    // 
//            null,    // 优先级
//            null,    // 
//            null,    // 目标库位
//            null,    // 目标站
//            null,    // 源站
//            null,    // 源库位
//            null,    // 
//            null,    // 拣料(checkBox)
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 退出(checkBox)
//            null,    // 
//            null,    // 空板(checkBox)
//            null,    // 工作时间
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 堆垛机启动时间
//            null,    // 堆垛机停止时间
//            null,    // 拣料时间
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 创建者
//            null,    // 添加时间
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 
//            null,    // 条码
//            null,    // 
//            null,    // 
//            null,    // 满板(checkBox)
//            null,    // 
//            null,    // 
//            null    // 
//    );

    public String getWrkNo$() {
        WrkMastService service = SpringUtils.getBean(WrkMastService.class);
        WrkMast wrkMast = service.selectById(this.wrkNo);
        if (!Cools.isEmpty(wrkMast)) {
            return String.valueOf(wrkMast.getWrkId());
        }
        return null;
    }

    public String getYmd$() {
        if (Cools.isEmpty(this.ymd)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
    }

    public String getWrkSts$() {
        BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
        BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
        if (!Cools.isEmpty(basWrkStatus)) {
            return String.valueOf(basWrkStatus.getWrkDesc());
        }
        return null;
    }

    public String getIoType$() {
        BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
        BasWrkIotype basWrkIotype = service.selectById(this.ioType);
        if (!Cools.isEmpty(basWrkIotype)) {
            return String.valueOf(basWrkIotype.getIoDesc());
        }
        return null;
    }

    public String getCrnNo$() {
        BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
        BasCrnp basCrnp = service.selectById(this.crnNo);
        if (!Cools.isEmpty(basCrnp)) {
            return String.valueOf(basCrnp.getCrnNo());
        }
        return null;
    }

    public String getWrkDate$() {
        if (Cools.isEmpty(this.wrkDate)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
    }

    public String getLocNo$() {
        LocMastService service = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = service.selectById(this.locNo);
        if (!Cools.isEmpty(locMast)) {
            return String.valueOf(locMast.getLocNo());
        }
        return null;
    }

    public String getStaNo$() {
        BasDevpService service = SpringUtils.getBean(BasDevpService.class);
        BasDevp basDevp = service.selectById(this.staNo);
        if (!Cools.isEmpty(basDevp)) {
            return String.valueOf(basDevp.getDevNo());
        }
        return null;
    }

    public String getSourceStaNo$() {
        BasDevpService service = SpringUtils.getBean(BasDevpService.class);
        BasDevp basDevp = service.selectById(this.sourceStaNo);
        if (!Cools.isEmpty(basDevp)) {
            return String.valueOf(basDevp.getDevNo());
        }
        return null;
    }

    public String getSourceLocNo$() {
        LocMastService service = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = service.selectById(this.sourceLocNo);
        if (!Cools.isEmpty(locMast)) {
            return String.valueOf(locMast.getLocNo());
        }
        return null;
    }

    public String getIoTime$() {
        if (Cools.isEmpty(this.ioTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }

    public String getCrnStrTime$() {
        if (Cools.isEmpty(this.crnStrTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
    }

    public String getCrnEndTime$() {
        if (Cools.isEmpty(this.crnEndTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
    }

    public String getPlcStrTime$() {
        if (Cools.isEmpty(this.plcStrTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
    }

    public String getCrnPosTime$() {
        if (Cools.isEmpty(this.crnPosTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
    }

    public String getRefIotime$() {
        if (Cools.isEmpty(this.refIotime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
    }

    public String getModiUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getModiTime$() {
        if (Cools.isEmpty(this.modiTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAppeUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getAppeTime$() {
        if (Cools.isEmpty(this.appeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getErrorTime$() {
        if (Cools.isEmpty(this.errorTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
    }

    public String getLogErrTime$() {
        if (Cools.isEmpty(this.logErrTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
    }


}

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -23,11 +23,12 @@

    private static final long serialVersionUID = 1L;

    @TableId(value = "wrk_id", type = IdType.AUTO)
    private Long wrkId;
    /**
     * 工作号
     */
    @ApiModelProperty(value = "工作号")
    @TableId(value = "wrk_no", type = IdType.INPUT)
    @TableField("wrk_no")
    private Integer wrkNo;


 src/main/java/com/zy/asrs/entity/WrkMastLog.java

@@ -30,6 +30,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    private Long wrkId;
    /**
     * 工作号
     */

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

@@ -1,6 +1,6 @@
package com.zy.asrs.entity.param;

import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import lombok.Data;

import java.util.List;
@@ -17,7 +17,7 @@

    private String orderNo;

    private List<OrderDetl> orderDetlList;
    private List<OrderDetlPakout> orderDetlPakoutList;


}

 src/main/java/com/zy/asrs/enums/LocStsType.java

New file
@@ -0,0 +1,60 @@
package com.zy.asrs.enums;

public enum LocStsType {

    //空板
    LOC_STS_TYPE_D("D", "空板"),
    //在库
    LOC_STS_TYPE_F("F", "在库"),
    //空库
    LOC_STS_TYPE_O("O", "空库"),
    //禁用
    LOC_STS_TYPE_X("X", "禁用"),
    //入库预约
    LOC_STS_TYPE_S("S", "入库预约"),
    //出库预约
    LOC_STS_TYPE_R("R", "出库预约"),
    ;

    public String type;

    public String desc;

    LocStsType(String type, String desc) {
        this.type = type;
        this.desc = desc;
    }


    public static LocStsType get(String el) {
        for (LocStsType value : LocStsType.values()) {
            if (el.equals(value.toString())) {
                return value;
            }
        }
        return null;
    }

//    /**
//     * @author Ryan
//     * @date 2025/8/28
//     * @description: RCS库位状态转换
//     * @version 1.0
//     */
//    public static String getLocSts(String val) {
//        if (val.equals(RcsLocStsType.LOC_STS_TYPE_D.type)) {
//            return LocStsType.LOC_STS_TYPE_O.type;
//        } else if (val.equals(RcsLocStsType.LOC_STS_TYPE_F.type)) {
//            return LocStsType.LOC_STS_TYPE_F.type;
//        } else if (val.equals(RcsLocStsType.LOC_STS_TYPE_S.type)) {
//            return LocStsType.LOC_STS_TYPE_S.type;
//        } else if (val.equals(RcsLocStsType.LOC_STS_TYPE_R.type)) {
//            return LocStsType.LOC_STS_TYPE_R.type;
//        } else if (val.equals(RcsLocStsType.LOC_STS_TYPE_X.type)) {
//            return LocStsType.LOC_STS_TYPE_X.type;
//        }
//        return null;
//    }


}

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

copy from src/main/java/com/zy/asrs/mapper/PackMapper.java
copy to src/main/java/com/zy/asrs/mapper/BasAreasMapper.java
File was copied from src/main/java/com/zy/asrs/mapper/PackMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.entity.BasAreas;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface PackMapper extends BaseMapper<Pack> {
public interface BasAreasMapper extends BaseMapper<BasAreas> {

}

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

File was renamed from src/main/java/com/zy/asrs/mapper/RequestLogMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.RequestLog;
import com.zy.asrs.entity.BasStation;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface RequestLogMapper extends BaseMapper<RequestLog> {
public interface BasStationMapper extends BaseMapper<BasStation> {

}

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

File was deleted

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

New file
@@ -0,0 +1,15 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasWhsType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface BasWhsTypeMapper extends BaseMapper<BasWhsType> {

    BasWhsType selectByIdentifying(@Param("identifying") String identifying);

}

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

copy from src/main/java/com/zy/asrs/mapper/PackMapper.java
copy to src/main/java/com/zy/asrs/mapper/LocCacheMapper.java
File was copied from src/main/java/com/zy/asrs/mapper/PackMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.entity.LocCache;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface PackMapper extends BaseMapper<Pack> {
public interface LocCacheMapper extends BaseMapper<LocCache> {

}

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

@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.param.PrintDataDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -12,15 +12,15 @@

@Mapper
@Repository
public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
public interface OrderDetlMapper extends BaseMapper<OrderDetlPakout> {

    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
    OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);

    OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
    OrderDetlPakout selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);

    List<OrderDetl> selectWorkingDetls(Long orderId);
    List<OrderDetlPakout> selectWorkingDetls(Long orderId);

    List<OrderDetl> getPakoutPage(Map<String, Object> map);
    List<OrderDetlPakout> getPakoutPage(Map<String, Object> map);

    Integer getPakoutPageCount(Map<String, Object> map);

@@ -30,7 +30,7 @@

    int modifyStatus(@Param("orderId") Long orderId, @Param("status") Integer status);

    int addToLogTable(OrderDetl orderDetl);
    int addToLogTable(OrderDetlPakout orderDetlPakout);

    int increaseQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);


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

@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderPakin;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -10,19 +10,19 @@

@Mapper
@Repository
public interface OrderMapper extends BaseMapper<Order> {
public interface OrderMapper extends BaseMapper<OrderPakin> {

    int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId);

    List<Order> selectComplete();
    List<OrderPakin> selectComplete();

    List<Order> selectComplete8();
    List<OrderPakin> selectComplete8();

    int addToLogTable(Order order);
    int addToLogTable(OrderPakin order);

    List<Order> selectorderNoL(@Param("orderNo") String orderNo);
    List<OrderPakin> selectorderNoL(@Param("orderNo") String orderNo);

    Order selectOrderMoveStatus();
    OrderPakin selectOrderMoveStatus();

    Order selectOrderMoveStatusInitial();
    OrderPakin selectOrderMoveStatusInitial();
}

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

copy from src/main/java/com/zy/asrs/mapper/RequestLogMapper.java
copy to src/main/java/com/zy/asrs/mapper/TaskDetlLogMapper.java
File was copied from src/main/java/com/zy/asrs/mapper/RequestLogMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.RequestLog;
import com.zy.asrs.entity.TaskDetlLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface RequestLogMapper extends BaseMapper<RequestLog> {
public interface TaskDetlLogMapper extends BaseMapper<TaskDetlLog> {

}

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

copy from src/main/java/com/zy/asrs/mapper/PackMapper.java
copy to src/main/java/com/zy/asrs/mapper/TaskDetlMapper.java
File was copied from src/main/java/com/zy/asrs/mapper/PackMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.entity.TaskDetl;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface PackMapper extends BaseMapper<Pack> {
public interface TaskDetlMapper extends BaseMapper<TaskDetl> {

}

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

copy from src/main/java/com/zy/asrs/mapper/PackMapper.java
copy to src/main/java/com/zy/asrs/mapper/TaskLogMapper.java
File was copied from src/main/java/com/zy/asrs/mapper/PackMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.entity.TaskLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface PackMapper extends BaseMapper<Pack> {
public interface TaskLogMapper extends BaseMapper<TaskLog> {

}

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

File was renamed from src/main/java/com/zy/asrs/mapper/PackMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.entity.Task;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface PackMapper extends BaseMapper<Pack> {
public interface TaskMapper extends BaseMapper<Task> {

}

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

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasAreas;

public interface BasAreasService extends IService<BasAreas> {

}

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

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasStation;

public interface BasStationService extends IService<BasStation> {

}

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

File was deleted

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

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasWhsType;

public interface BasWhsTypeService extends IService<BasWhsType> {
    BasWhsType selectByIdentifying(String Identifying);
}

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

New file
@@ -0,0 +1,18 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.core.common.R;
import com.zy.asrs.entity.LocCache;
import com.zy.asrs.entity.param.LocMastInitParam;

public interface LocCacheService extends IService<LocCache> {


    /**
     * @author Ryan
     * @date 2025/9/18
     * @description: 初始化库区库位
     * @version 1.0
     */
    R initLocCache(LocMastInitParam param, Long userId);
}

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

New file
@@ -0,0 +1,9 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocCheck;

public interface LocCheckService extends IService<LocCheck> {

    void autoCreatePick(String prec);
}

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

@@ -4,12 +4,11 @@
import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;

import java.util.Date;
import java.util.List;
import java.util.Map;

public interface MobileService {
@@ -36,15 +35,13 @@
     */
    void adjust(MobileAdjustParam param, Long userId);

    void packComb(CombParam param, Long userId);

    void pakoutByOrder(JSONObject param, Long userId);

    void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
    void stockOut(OrderDetlPakout orderDetlPakout, BasDevp staNo, LocDetl locDetl,
                  Double curOutQty, Integer ioType, Long userId, Date now);

    void leftoversOut(Map<String, Object> map, Long userId);



}

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

@@ -1,12 +1,7 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.core.common.R;
import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.PakinParam;

import java.util.List;

public interface NodeService extends IService<Node> {


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

@@ -35,9 +35,6 @@

    // ------------------------------------------

    // 打包上线
    void packageUp(PackParam param);

    /**
     * 同步商品信息
     *

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

@@ -2,21 +2,21 @@

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;

import java.util.List;

public interface OrderDetlService extends IService<OrderDetl> {
public interface OrderDetlService extends IService<OrderDetlPakout> {

    List<OrderDetl> selectByOrderId(Long orderId);
    List<OrderDetlPakout> selectByOrderId(Long orderId);

    Page<OrderDetl> getPakoutPage(Page<OrderDetl> page);
    Page<OrderDetlPakout> getPakoutPage(Page<OrderDetlPakout> page);

    OrderDetl selectItem(Long orderId, String matnr, String batch);
    OrderDetlPakout selectItem(Long orderId, String matnr, String batch);

    OrderDetl selectItem(String orderNo, String matnr, String batch);
    OrderDetlPakout selectItem(String orderNo, String matnr, String batch);

    OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
    OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetlPakouts, Long orderId, String matnr, String batch);

    boolean increase(Long orderId, String matnr, String batch, Double qty);

@@ -24,7 +24,7 @@

    boolean modifyStatus(Long orderId, Integer status);

    boolean addToLogTable(OrderDetl orderDetl);
    boolean addToLogTable(OrderDetlPakout orderDetlPakout);

    boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);


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

@@ -1,18 +1,18 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;

import java.util.List;

public interface OrderService extends IService<Order> {
public interface OrderService extends IService<OrderPakin> {

    Order selectByNo(String orderNo);
    OrderPakin selectByNo(String orderNo);

    List<OrderDetl> selectWorkingDetls(Long orderId);
    List<OrderDetlPakout> selectWorkingDetls(Long orderId);

    boolean updateSettle(Long orderId, Long settle, Long userId);

@@ -22,16 +22,16 @@

    void remove(Long orderId);

    List<Order> selectComplete();
    List<OrderPakin> selectComplete();

    List<Order> selectComplete8();
    List<OrderPakin> selectComplete8();

    boolean addToLogTable(Order order);
    boolean addToLogTable(OrderPakin order);

    List<Order> selectorderNoL(String orderNo);
    List<OrderPakin> selectorderNoL(String orderNo);

    Order selectOrderMoveStatus();
    OrderPakin selectOrderMoveStatus();

    Order selectOrderMoveStatusInitial();
    OrderPakin selectOrderMoveStatusInitial();

}

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

File was deleted

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

File was deleted

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

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.TaskDetlLog;

public interface TaskDetlLogService extends IService<TaskDetlLog> {

}

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

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.TaskDetl;

public interface TaskDetlService extends IService<TaskDetl> {

}

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

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.TaskLog;

public interface TaskLogService extends IService<TaskLog> {

}

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

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.Task;

public interface TaskService extends IService<Task> {

}

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

@@ -19,6 +19,7 @@

    /**
     * 全板入库
     *
     * @return 库位号
     */
    String startupFullPutStore(FullStoreParam param, Long userId);
@@ -30,18 +31,22 @@

    /**
     * 出库作业
     * @param staNo 目标站点
     *
     * @param staNo    目标站点
     * @param locDetls 待出库物料
     * @param ioType 入出库类型
     * @param ioType   入出库类型
     */
    void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);

    void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);

    void stockOutSxk(BasDevp staNo, TaskDto taskDto, Long userId);

    void stockOutLibraryType(BasDevp staNo, TaskDto taskDto, Long userId);

    /**
     * 空板入库
     *
     * @return 库位号
     */
    String emptyPlateIn(Integer sourceStaNo, Long userId);
@@ -53,6 +58,7 @@

    /**
     * 自动空板出库
     *
     * @param param
     * @return
     */

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.AdjDetlMapper;
import com.zy.asrs.entity.AdjDetl;
import com.zy.asrs.service.AdjDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.AdjDetl;
import com.zy.asrs.mapper.AdjDetlMapper;
import com.zy.asrs.service.AdjDetlService;
import org.springframework.stereotype.Service;

import java.util.Date;

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

@@ -33,7 +33,7 @@
                request,    // 请求内容
                response,
                null,    // 异常内容
                success?1:0 ,    // 结果
                success ? 1 : 0,    // 结果
                1,    // 状态
                now,    // 添加时间
                null,    // 修改时间

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.AutoMoveMapper;
import com.zy.asrs.entity.AutoMove;
import com.zy.asrs.service.AutoMoveService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.AutoMove;
import com.zy.asrs.mapper.AutoMoveMapper;
import com.zy.asrs.service.AutoMoveService;
import org.springframework.stereotype.Service;

@Service("autoMoveService")

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasAreas;
import com.zy.asrs.mapper.BasAreasMapper;
import com.zy.asrs.service.BasAreasService;
import org.springframework.stereotype.Service;

@Service("basAreasService")
public class BasAreasServiceImpl extends ServiceImpl<BasAreasMapper, BasAreas> implements BasAreasService {

}

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.BasCrnOptMapper;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.service.BasCrnOptService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.mapper.BasCrnOptMapper;
import com.zy.asrs.service.BasCrnOptService;
import org.springframework.stereotype.Service;

@Service("basCrnOptService")

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

@@ -4,7 +4,6 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
@@ -44,7 +43,7 @@
//            log.error("{}号堆垛机不存在", crnNo);
            return false;
        }
        if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3){
        if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3) {
            log.error("{}号堆垛机非自动连线状态，无法作业!", crnNo);
            return false;
        }
@@ -60,7 +59,7 @@
            int maxCount = 6;
            int storeCount = wrkMastService.getStoreCount(crnNo);

            if(storeCount >= maxCount && crnNo == 1){
            if (storeCount >= maxCount && crnNo == 1) {
                log.error("{}号堆垛机暂存数已满!", crnNo);
                return false;
            }

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.BasErrLogMapper;
import com.zy.asrs.entity.BasErrLog;
import com.zy.asrs.service.BasErrLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasErrLog;
import com.zy.asrs.mapper.BasErrLogMapper;
import com.zy.asrs.service.BasErrLogService;
import org.springframework.stereotype.Service;

@Service("basErrLogService")

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.BasPlcerrorMapper;
import com.zy.asrs.entity.BasPlcerror;
import com.zy.asrs.service.BasPlcerrorService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasPlcerror;
import com.zy.asrs.mapper.BasPlcerrorMapper;
import com.zy.asrs.service.BasPlcerrorService;
import org.springframework.stereotype.Service;

@Service("basPlcerrorService")

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.mapper.BasStationMapper;
import com.zy.asrs.service.BasStationService;
import org.springframework.stereotype.Service;

@Service("basStationService")
public class BasStationServiceImpl extends ServiceImpl<BasStationMapper, BasStation> implements BasStationService {

}

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

File was deleted

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

New file
@@ -0,0 +1,15 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasWhsType;
import com.zy.asrs.mapper.BasWhsTypeMapper;
import com.zy.asrs.service.BasWhsTypeService;
import org.springframework.stereotype.Service;

@Service("basWhsService")
public class BasWhsTypeServiceImpl extends ServiceImpl<BasWhsTypeMapper, BasWhsType> implements BasWhsTypeService {
    @Override
    public BasWhsType selectByIdentifying(String identifying) {
        return this.baseMapper.selectByIdentifying(identifying);
    }
}

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

@@ -1,12 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.mapper.DocTypeMapper;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.mapper.DocTypeMapper;
import com.zy.asrs.service.DocTypeService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.Date;

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

New file
@@ -0,0 +1,84 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasAreas;
import com.zy.asrs.entity.LocCache;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.mapper.LocCacheMapper;
import com.zy.asrs.service.BasAreasService;
import com.zy.asrs.service.LocCacheService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Slf4j
@Service("locCacheService")
public class LocCacheServiceImpl extends ServiceImpl<LocCacheMapper, LocCache> implements LocCacheService {


    @Autowired
    private BasAreasService basAreasService;

    /**
     * @author Ryan
     * @date 2025/9/18
     * @description: 初始化库区库位信息
     * @version 1.0
     */
    @Override
    public R initLocCache(LocMastInitParam param, Long userId) {
        try {
            List<LocCache> list = new ArrayList<>();
            BasAreas areas = basAreasService.selectById(param.getIdentifying());
            if (Cools.isEmpty(areas)) {
                return R.error("库区不存在！！！");
            }
            for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
                for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
                    for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
                        // 获取库位号
                        String locNo = String.format("CA") + String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
                        Date now = new Date();
                        LocCache locMast = new LocCache();
                        locMast.setLocNo(locNo);
                        locMast.setLocSts("O");
                        locMast.setRow1(r); // 排
                        locMast.setBay1(b); // 列
                        locMast.setLev1(l); // 层
                        locMast.setId(null);
                        locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
                        locMast.setLocType2(param.getLocType2());
                        locMast.setLocType3(param.getLocType3());
                        locMast.setAppeUser(userId);
                        locMast.setAppeTime(now);
                        locMast.setModiUser(userId);
                        locMast.setModiTime(now);
                        locMast.setAreaId(areas.getId());
                        locMast.setAreaName(areas.getName());
                        list.add(locMast);
                    }
                }
            }
            if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1) {
                if (!this.delete(new EntityWrapper<>())) {
                    throw new CoolException("删除失败！！");
                }
            }

            if (!this.insertBatch(list)) {
                throw new CoolException("添加失败！！");
            }
            return R.ok("初始化成功");
        } catch (Exception e) {
            return R.error("初始化失败===>" + e.getMessage());
        }
    }
}

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

@@ -20,12 +20,12 @@

    @Override
    public LocMast queryFreeLocMast(Integer row, Short locType1) {
        return this.baseMapper.queryFreeLocMast(row, locType1,1L);
        return this.baseMapper.queryFreeLocMast(row, locType1, 1L);
    }

    @Override
    public LocMast queryFreeLocMast(Integer row, Short locType1,Long type) {
        return this.baseMapper.queryFreeLocMast(row, locType1,type);
    public LocMast queryFreeLocMast(Integer row, Short locType1, Long type) {
        return this.baseMapper.queryFreeLocMast(row, locType1, type);
    }

    @Override
@@ -41,7 +41,7 @@
    }

    @Override
    public List<String> queryGroupEmptyStock(String sourceLocNo,Long type) {
    public List<String> queryGroupEmptyStock(String sourceLocNo, Long type) {
        if (Cools.isEmpty(sourceLocNo)) {
            return null;
        }
@@ -57,15 +57,15 @@
        if (locMast == null) {
            return false;
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 1;
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(), 1L) > 1;
    }

    @Override
    public Boolean checkEmptyCount(LocMast locMast,Long type) {
    public Boolean checkEmptyCount(LocMast locMast, Long type) {
        if (locMast == null) {
            return false;
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),type) > 1;
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(), type) > 1;
    }

    /*
@@ -88,19 +88,19 @@
//    }

    @Override
    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
        if (curRow>nearRow){
            return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
    public LocMast selectLocByLocStsPakInF(Integer curRow, Integer nearRow, LocMast locMast, Long type) {
        if (curRow > nearRow) {
            return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
        }
        return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
        return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
    }

    @Override
    public LocMast selectLocByLocStsPakInShuttleF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
        if (curRow>nearRow){
            return this.baseMapper.selectLocByLocStsPakInShuttleF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
    public LocMast selectLocByLocStsPakInShuttleF(Integer curRow, Integer nearRow, LocMast locMast, Long type) {
        if (curRow > nearRow) {
            return this.baseMapper.selectLocByLocStsPakInShuttleF1(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
        }
        return this.baseMapper.selectLocByLocStsPakInShuttleF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
        return this.baseMapper.selectLocByLocStsPakInShuttleF2(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
    }

    /*
@@ -114,11 +114,11 @@
//        return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L);
//    }
    @Override
    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
        if (curRow>nearRow){
            return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
    public LocMast selectLocByLocStsPakInO(Integer curRow, Integer nearRow, LocMast locMast, Long type) {
        if (curRow > nearRow) {
            return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
        }
        return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
        return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
    }

    @Override
@@ -127,33 +127,33 @@
    }

    @Override
    public Boolean checkWhole(List<LocDetl> locDetls,Long type) {
    public Boolean checkWhole(List<LocDetl> locDetls, Long type) {
        return null;
    }

    @Override
    public List<LocMast> queryShallowLocFMast(Integer crnNo) {
        return this.baseMapper.queryShallowLocFMast(crnNo,1L);
        return this.baseMapper.queryShallowLocFMast(crnNo, 1L);
    }

    @Override
    public List<LocMast> queryShallowLocFMast(Integer crnNo,Long type) {
        return this.baseMapper.queryShallowLocFMast(crnNo,type);
    public List<LocMast> queryShallowLocFMast(Integer crnNo, Long type) {
        return this.baseMapper.queryShallowLocFMast(crnNo, type);
    }

    @Override
    public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo) {
        if (crnNo==1){
            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,1L);
    public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay, Integer lev, Integer crnNo) {
        if (crnNo == 1) {
            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay, lev, 1L);
        }
        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,1L);
        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay, lev, 1L);
    }

    @Override
    public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo,Long type) {
        if (crnNo==1){
            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,type);
    public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay, Integer lev, Integer crnNo, Long type) {
        if (crnNo == 1) {
            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay, lev, type);
        }
        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay, lev, type);
    }
}

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

@@ -2,10 +2,10 @@

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.service.MatService;
import org.springframework.stereotype.Service;

import java.util.List;

@@ -16,6 +16,7 @@
    public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx) {
        return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
    }

    @Override
    public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs) {
        return page.setRecords(baseMapper.listByPage2(page, tagId, matnr, maktx, specs));
@@ -38,13 +39,14 @@
    }

    @Override
    public Page<Mat> getMatTurnPage(Page<Mat> page){
    public Page<Mat> getMatTurnPage(Page<Mat> page) {
        page.setRecords(baseMapper.getMatTurnPage(page.getCondition()));
//        page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
        page.setTotal(16);
        return page;
    };
    }

    ;


}

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

@@ -53,8 +53,6 @@
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private PackService packService;
    @Autowired
    private OpenService openService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
@@ -303,7 +301,7 @@
            // 关联组托
        } else {

            Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", param.getOrderNo()));
            OrderPakin order = orderService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
            if (Cools.isEmpty(order) || order.getSettle() > 2) {
                throw new CoolException("单据编号已过期");
            }
@@ -312,23 +310,23 @@
            param.getCombMats().forEach(elem -> {

                // 订单明细数量校验
                OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
                if (elem.getAnfme() > orderDetl.getEnableQty()) {
                    throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
                OrderDetlPakout orderDetlPakout = orderDetlService.selectById(elem.getDetlId());
                if (elem.getAnfme() > orderDetlPakout.getEnableQty()) {
                    throw new CoolException(orderDetlPakout.getMatnr() + "入库数量不合法");
                }
                // 修改订单作业数量
                if (!orderDetlService.increaseWorkQtyById(orderDetl.getId(), elem.getAnfme())) {
                if (!orderDetlService.increaseWorkQtyById(orderDetlPakout.getId(), elem.getAnfme())) {
                    throw new CoolException("修改单据作业数量失败");
                }

                Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
                Mat mat = matService.selectByMatnr(orderDetlPakout.getMatnr());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(orderDetl.getMatnr() + "商品档案不存在");
                    throw new CoolException(orderDetlPakout.getMatnr() + "商品档案不存在");
                }
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
                waitPakin.setBatch(orderDetl.getBatch());     // 序列码
                waitPakin.setBatch(orderDetlPakout.getBatch());     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(elem.getAnfme());  // 数量
@@ -338,7 +336,7 @@
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);

                waitPakin.setBatch(orderDetl.getBatch());
                waitPakin.setBatch(orderDetlPakout.getBatch());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -360,7 +358,7 @@
        if (param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)) {
            throw new CoolException("入库物料数量不能为空");
        }
        Order order = orderService.selectByNo(param.getOrderNo());
        OrderPakin order = orderService.selectByNo(param.getOrderNo());
        if (Cools.isEmpty(order) || order.getSettle() > 2) {
            throw new CoolException("单据编号已过期");
        }
@@ -386,12 +384,12 @@
        Date now = new Date();
        for (CombParam.CombMat combMat : param.getCombMats()) {
            // 订单明细数量校验
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), combMat.getMatnr(), combMat.getBatch());
            if (Cools.isEmpty(orderDetl)) {
            OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(order.getId(), combMat.getMatnr(), combMat.getBatch());
            if (Cools.isEmpty(orderDetlPakout)) {
                throw new CoolException("该单据中未找到对应物料明细");
            }
            if (combMat.getAnfme() > orderDetl.getEnableQty()) {
                throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
            if (combMat.getAnfme() > orderDetlPakout.getEnableQty()) {
                throw new CoolException(orderDetlPakout.getMatnr() + "入库数量不合法");
            }
            // 修改订单作业数量
            if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) {
@@ -411,12 +409,12 @@
            wrkDetl.setAppeUser(userId);
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(userId);
            wrkDetl.setManu(orderDetl.getManu());
            wrkDetl.setSupp(orderDetl.getSupp());
            wrkDetl.setTemp1(orderDetl.getTemp1());
            wrkDetl.setTemp2(orderDetl.getTemp2());
            wrkDetl.setTemp3(orderDetl.getTemp3());
            wrkDetl.setTemp4(orderDetl.getTemp4());
            wrkDetl.setManu(orderDetlPakout.getManu());
            wrkDetl.setSupp(orderDetlPakout.getSupp());
            wrkDetl.setTemp1(orderDetlPakout.getTemp1());
            wrkDetl.setTemp2(orderDetlPakout.getTemp2());
            wrkDetl.setTemp3(orderDetlPakout.getTemp3());
            wrkDetl.setTemp4(orderDetlPakout.getTemp4());
            wrkDetlService.insert(wrkDetl);
        }

@@ -507,161 +505,7 @@

    }

    @Override
    @Transactional
    public void packComb(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }
        Date now = new Date();

        boolean packDown = Parameter.get().getPackDown().equals("true");

        // 无单组托
        if (Cools.isEmpty(param.getOrderNo())) {

            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                // 打包上线数据校验
                if (packDown) {
                    Pack pack = packService.selectByBarcode(elem.getMatnr());
                    if (pack == null) {
                        throw new CoolException(elem.getMatnr() + "条码冗余，请检查！");
                    }
                    if (pack.getSettle() != 1) {
                        throw new CoolException(elem.getMatnr() + "条码已下线，请检查！");
                    }
                }
                Mat analyse = MatUtils.analyseMat(elem.getMatnr());
                // 条码、物料代码、序列号、数量
                DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                } else {
                    detlDtos.add(detlDto);
                }
            });

            if (packDown) {
                MesCombParam mesCombParam = new MesCombParam();
                mesCombParam.setZpallet(param.getBarcode());
                mesCombParam.setPakinTime(DateUtils.convert(now));
                mesCombParam.setLgort("5008");
                mesCombParam.setPlantCode("5000");
                mesCombParam.setFromCode("5012-20");
                mesCombParam.setStationCode("JJQ-PFZPDB-XX");
                for (DetlDto detlDto : detlDtos) {
                    mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
                }
                String response = "";
                boolean success = false;
//                try {
//                    response = new HttpHandler.Builder()
//                            .setUri(url)
//                            .setPath(code)
//                            .setJson(JSON.toJSONString(mesCombParam))
//                            .build()
//                            .doPost();
//                    JSONObject jsonObject = JSON.parseObject(response);
//                    if (jsonObject.getInteger("code").equals(200)) {
//                        success = true;
//                    } else if (jsonObject.getInteger("code").equals(500)) {
//                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
//                        throw new CoolException(jsonObject.getString("msg"));
//                    } else {
//                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
//                        throw new CoolException("上报mes系统失败");
//                    }
//                } catch (Exception e) {
//                    log.error("fail", e);
//                    throw new CoolException(e.getMessage());
//                } finally {
//                    try {
//                        // 保存接口日志
//                        apiLogService.save(
//                                "打包下线帮托上报",
//                                MesConstant.URL + MesConstant.PACK_DOWN_URL,
//                                null,
//                                "127.0.0.1",
//                                JSON.toJSONString(mesCombParam),
//                                response,
//                                success
//                        );
//                    } catch (Exception e) { log.error("", e); }
//                }

            }

            // 生成入库单据
            String orderNo = "PACK" + snowflakeIdWorker.nextId();
            OpenOrderPakinParam openParam = new OpenOrderPakinParam();
            openParam.setOrderNo(orderNo);
            openParam.setInboundDate(DateUtils.convert(now));
            openParam.setOrderType("打包入库单");
            openParam.setDetails(detlDtos);
            openService.pakinOrderCreate(openParam);
            Order order = orderService.selectByNo(orderNo);
            if (null == order) {
                throw new CoolException("生成单据失败");
            }
            if (!orderService.updateSettle(order.getId(), 2L, userId)) {
                throw new CoolException("修改单据状态失败");
            }

            // 生成入库通知档
            for (DetlDto detlDto : detlDtos) {

                // 修改作业数量 ----------------------------------------
                // 订单明细数量校验
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
                if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
                    throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
                }
                // 修改订单作业数量
                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                    throw new CoolException("修改单据作业数量失败");
                }

                // 保存入库通知档
                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                }
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.setOrderNo(orderNo);
                waitPakin.setBatch(detlDto.getBatch());
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
                // 修改打包数据状态
                Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
                pack.setSettle(2L);
                pack.setUpdateTime(now);
                pack.setUpdateBy(userId);
                if (!packService.updateById(pack)) {
                    throw new CoolException("修改打包数据异常");
                }
            }

        }
    }

    @Override
    @Transactional
@@ -671,16 +515,16 @@

        BasDevp sta = basDevpService.checkSiteStatus(staNo);
        //根据订单号生成出库任务工作档
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
        OrderPakin order = orderService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
        if (order.getSettle() != 1 && order.getSettle() != 2) {
            throw new CoolException("该订单已处理");
        }

        List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
        Date now = new Date();
        for (OrderDetl orderDetl : orderDetls) {
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            //查询所有库位状态为F的库位信息
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, null, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
            if (locDetls.size() == 0) {
                throw new CoolException("库存中没有该物料");
            }
@@ -696,7 +540,7 @@
                }

                //可出库数量 = 订单数量 - 作业中数量
                Double outQty = orderDetl.getAnfme() - orderDetl.getWorkQty();
                Double outQty = orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty();
                if (outQty <= 0) {
                    break;
                }
@@ -705,21 +549,21 @@
                Double curOutQty = outQty >= locDetl.getAnfme() ? locDetl.getAnfme() : outQty;   //本次出库量
                int ioType = sumCount <= curOutQty ? 101 : 103;

                stockOut(orderDetl, sta, locDetl, curOutQty, ioType, userId, now);
                stockOut(orderDetlPakout, sta, locDetl, curOutQty, ioType, userId, now);
                order.setSettle(2L);
                order.setUpdateBy(userId);
                order.setUpdateTime(now);
                if (!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))) {
                if (!orderService.update(order, new EntityWrapper<OrderPakin>().eq("order_no", orderNo))) {
                    throw new CoolException("更新订单状态失败");
                }
                orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
                orderDetl.setUpdateBy(userId);
                orderDetl.setUpdateTime(now);
                Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", orderDetl.getMatnr());
                if (!Cools.isEmpty(orderDetl.getBatch())) {
                    wrapper.eq("batch", orderDetl.getBatch());
                orderDetlPakout.setWorkQty(orderDetlPakout.getWorkQty() + curOutQty);
                orderDetlPakout.setUpdateBy(userId);
                orderDetlPakout.setUpdateTime(now);
                Wrapper wrapper = new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo).eq("matnr", orderDetlPakout.getMatnr());
                if (!Cools.isEmpty(orderDetlPakout.getBatch())) {
                    wrapper.eq("batch", orderDetlPakout.getBatch());
                }
                if (!orderDetlService.update(orderDetl, wrapper)) {
                if (!orderDetlService.update(orderDetlPakout, wrapper)) {
                    throw new CoolException("更新订单明细失败");
                }
            }
@@ -793,7 +637,7 @@

    @Override
    @Transactional
    public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl, Double curOutQty, Integer ioType, Long userId, Date now) {
    public void stockOut(OrderDetlPakout orderDetlPakout, BasDevp staNo, LocDetl locDetl, Double curOutQty, Integer ioType, Long userId, Date now) {
        // 获取库位
        LocMast locMast = locMastService.selectById(locDetl.getLocNo());
        // 获取路径
@@ -835,7 +679,7 @@
        wrkDetl.setWrkNo(workNo);
        wrkDetl.setIoTime(now);
        wrkDetl.setAnfme(curOutQty); // 数量
        wrkDetl.setOrderNo(orderDetl.getOrderNo());
        wrkDetl.setOrderNo(orderDetlPakout.getOrderNo());
        wrkDetl.setAppeTime(now);
        wrkDetl.setAppeUser(userId);
        wrkDetl.setModiTime(now);

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

@@ -2,26 +2,16 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.MatnrDto;
import com.zy.asrs.entity.param.PakinParam;
import com.zy.asrs.mapper.NodeMapper;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.NodeService;
import com.zy.asrs.utils.SaasUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.beans.Transient;
import java.util.Date;
import java.util.List;

@Service("nodeService")
public class NodeServiceImpl extends ServiceImpl<NodeMapper, Node> implements NodeService {
@@ -31,6 +21,7 @@
    private MatService matService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Override
    public Node getTop() {
        Node top = this.selectOne(new EntityWrapper<Node>().eq("type", 0).eq("level", 0));
@@ -71,8 +62,6 @@
    public Node selectByUuid(String uuid, Long hostId, Integer type, Long parentId) {
        return selectOne(new EntityWrapper<Node>().eq("host_id", hostId).eq("uuid", uuid).eq("type", type).eq("parent_id", parentId));
    }




}

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

@@ -14,14 +14,12 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;

@@ -45,8 +43,6 @@
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private PackService packService;
    @Autowired
    private TagService tagService;
    @Autowired
    private TagMapper tagMapper;
@@ -60,35 +56,35 @@
    @Autowired
    private ApiLogService apiLogService;

    public void callApiLogSaveOrder(Object order,  String name, Boolean bool) {
        apiLogService.save(name, "null", null,null,
                 JSON.toJSONString(order),
    public void callApiLogSaveOrder(Object order, String name, Boolean bool) {
        apiLogService.save(name, "null", null, null,
                JSON.toJSONString(order),
                null, bool);
    }

    @Override
    @Transactional
    public void pakinOrderCreate(OpenOrderPakinParam param) {
        callApiLogSaveOrder(param,"入库单", true);
        callApiLogSaveOrder(param, "入库单", true);

        Order order = orderService.selectByNo(param.getOrderNo());
        if (!Cools.isEmpty(order) && order.getSettle() !=1) {
        OrderPakin order = orderService.selectByNo(param.getOrderNo());
        if (!Cools.isEmpty(order) && order.getSettle() != 1) {
            throw new CoolException(param.getOrderNo() + "单据已有工作任务");
        }
        if (!Cools.isEmpty(order)) {
            boolean orderNo = orderService.delete(new EntityWrapper<Order>().eq("order_no", param.getOrderNo()));
            boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNo()));
            boolean orderNo = orderService.delete(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
            boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", param.getOrderNo()));

        }
        DocType docType;
        if (param.getOrderType().equals("调拨单")){
             docType = docTypeService.selectOrAdd("调拨单(入)", Boolean.TRUE);
        }else {
             docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        if (param.getOrderType().equals("调拨单")) {
            docType = docTypeService.selectOrAdd("调拨单(入)", Boolean.TRUE);
        } else {
            docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        }
        Date now = new Date();
        // 单据主档
        order = new Order(
        order = new OrderPakin(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                param.getInboundDate(),    // 单据日期
@@ -132,8 +128,8 @@
        List<DetlDto> list = new ArrayList<>();
        List<DetlDto> orderDetails = param.getDetails();
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
                    , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getFromOrderNo()
                    , detail.getMark(), detail.getCustomer(), detail.getSuppName(), detail.getTemp1(), detail.getTemp2(), detail.getTemp3(), detail.getTemp4());
            dto.setQuality(detail.getQuality());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
@@ -148,30 +144,30 @@
            if (Cools.isEmpty(mat)) {
                throw new CoolException(detlDto.getMatnr() + "编号商品检索失败，请先添加商品");
            }
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);
            orderDetl.setBatch(detlDto.getBatch());
            orderDetl.setAnfme(detlDto.getAnfme());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setThreeCode(detlDto.getOrderNo());
            orderDetl.setSuppCode(detlDto.getFromOrderNo());
            orderDetl.setMemo(detlDto.getMemo());
            orderDetl.setManu(detlDto.getMark());
            orderDetl.setSupp(detlDto.getSuppName()); //供应商
            orderDetl.setSku(detlDto.getCustomer());
            orderDetl.setTemp1(detlDto.getTemp1());
            orderDetl.setTemp2(detlDto.getTemp2());
            orderDetl.setTemp3(detlDto.getTemp3());
            orderDetl.setTemp4(detlDto.getTemp4());
            orderDetl.setInspect(detlDto.getQuality());
            if (!orderDetlService.insert(orderDetl)) {
            OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
            orderDetlPakout.sync(mat);
            orderDetlPakout.setBatch(detlDto.getBatch());
            orderDetlPakout.setAnfme(detlDto.getAnfme());
            orderDetlPakout.setOrderId(order.getId());
            orderDetlPakout.setOrderNo(order.getOrderNo());
            orderDetlPakout.setCreateBy(9527L);
            orderDetlPakout.setCreateTime(now);
            orderDetlPakout.setUpdateBy(9527L);
            orderDetlPakout.setUpdateTime(now);
            orderDetlPakout.setStatus(1);
            orderDetlPakout.setQty(0.0D);
            orderDetlPakout.setThreeCode(detlDto.getOrderNo());
            orderDetlPakout.setSuppCode(detlDto.getFromOrderNo());
            orderDetlPakout.setMemo(detlDto.getMemo());
            orderDetlPakout.setManu(detlDto.getMark());
            orderDetlPakout.setSupp(detlDto.getSuppName()); //供应商
            orderDetlPakout.setSku(detlDto.getCustomer());
            orderDetlPakout.setTemp1(detlDto.getTemp1());
            orderDetlPakout.setTemp2(detlDto.getTemp2());
            orderDetlPakout.setTemp3(detlDto.getTemp3());
            orderDetlPakout.setTemp4(detlDto.getTemp4());
            orderDetlPakout.setInspect(detlDto.getQuality());
            if (!orderDetlService.insert(orderDetlPakout)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }
@@ -180,20 +176,20 @@
    @Override
    @Transactional
    public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
        callApiLogSaveOrder(param,"出库单", true);
        callApiLogSaveOrder(param, "出库单", true);
        List<OpenOrderCompeteResult> results = new ArrayList<>();
        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
            // 指定订单
            Order order = orderService.selectByNo(param.getOrderNo());
            OrderPakin order = orderService.selectByNo(param.getOrderNo());
            if (null != order) {
                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                results.add(result);
                result.setOrderNo(order.getOrderNo());
                result.setOrderTime(order.getOrderTime());
                result.setOrderType(order.getDocType$());
                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetl orderDetl : orderDetls) {
                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
                List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
                    result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
                }
                if (order.getSettle() == 4L) {
                    // 修改订单状态 4.完成 ===>> 6.已上报
@@ -204,16 +200,16 @@
            }
        } else {
            // 所有订单
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
            for (Order order : orders) {
            List<OrderPakin> orders = orderService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
            for (OrderPakin order : orders) {
                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                results.add(result);
                result.setOrderNo(order.getOrderNo());
                result.setOrderTime(order.getOrderTime());
                result.setOrderType(order.getDocType$());
                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetl orderDetl : orderDetls) {
                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
                List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
                    result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
                }
                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
@@ -227,8 +223,8 @@
    @Override
    @Transactional
    public void pakoutOrderCreate(OpenOrderPakoutParam param) {
        callApiLogSaveOrder(param,"出库单", true);
        Order order = orderService.selectByNo(param.getOrderNo());
        callApiLogSaveOrder(param, "出库单", true);
        OrderPakin order = orderService.selectByNo(param.getOrderNo());
        // 如果单据不存在则添加；如果单据存在，作业中无法修改，反之则修改单据
        if (!Cools.isEmpty(order)) {
            if (order.getSettle() > 1L) {
@@ -237,14 +233,14 @@
            orderService.remove(order.getId());
        }
        DocType docType;
        if (param.getOrderType().equals("调拨单")){
        if (param.getOrderType().equals("调拨单")) {
            docType = docTypeService.selectOrAdd("调拨单(出)", Boolean.FALSE);
        }else {
        } else {
            docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        }
        Date now = new Date();
        // 单据主档
        order = new Order(
        order = new OrderPakin(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                param.getInboundDate(),    // 单据日期
@@ -288,8 +284,8 @@
        List<DetlDto> list = new ArrayList<>();
        List<DetlDto> orderDetails = param.getDetails();
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),param.getFromOrderNo()
                    , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), param.getFromOrderNo()
                    , detail.getMark(), detail.getCustomer(), detail.getSuppName(), detail.getTemp1(), detail.getTemp2(), detail.getTemp3(), detail.getTemp4());
            dto.setTemp1(param.getQuality());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
@@ -304,29 +300,29 @@
            if (Cools.isEmpty(mat)) {
                throw new CoolException(detlDto.getMatnr() + "编号商品检索失败，请先添加商品");
            }
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);
            orderDetl.setBatch(detlDto.getBatch());
            orderDetl.setAnfme(detlDto.getAnfme());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setThreeCode(detlDto.getOrderNo());
            orderDetl.setSuppCode(detlDto.getFromOrderNo());
            orderDetl.setMemo(detlDto.getMemo());
            orderDetl.setManu(detlDto.getMark());
            orderDetl.setSupp(detlDto.getSuppName());
            orderDetl.setSku(detlDto.getCustomer());
            orderDetl.setTemp1(detlDto.getTemp1());
            orderDetl.setTemp2(detlDto.getTemp2());
            orderDetl.setTemp3(detlDto.getTemp3());
            orderDetl.setTemp4(detlDto.getTemp4());
            if (!orderDetlService.insert(orderDetl)) {
            OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
            orderDetlPakout.sync(mat);
            orderDetlPakout.setBatch(detlDto.getBatch());
            orderDetlPakout.setAnfme(detlDto.getAnfme());
            orderDetlPakout.setOrderId(order.getId());
            orderDetlPakout.setOrderNo(order.getOrderNo());
            orderDetlPakout.setCreateBy(9527L);
            orderDetlPakout.setCreateTime(now);
            orderDetlPakout.setUpdateBy(9527L);
            orderDetlPakout.setUpdateTime(now);
            orderDetlPakout.setStatus(1);
            orderDetlPakout.setQty(0.0D);
            orderDetlPakout.setThreeCode(detlDto.getOrderNo());
            orderDetlPakout.setSuppCode(detlDto.getFromOrderNo());
            orderDetlPakout.setMemo(detlDto.getMemo());
            orderDetlPakout.setManu(detlDto.getMark());
            orderDetlPakout.setSupp(detlDto.getSuppName());
            orderDetlPakout.setSku(detlDto.getCustomer());
            orderDetlPakout.setTemp1(detlDto.getTemp1());
            orderDetlPakout.setTemp2(detlDto.getTemp2());
            orderDetlPakout.setTemp3(detlDto.getTemp3());
            orderDetlPakout.setTemp4(detlDto.getTemp4());
            if (!orderDetlService.insert(orderDetlPakout)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }
@@ -337,16 +333,16 @@
        List<OpenOrderCompeteResult> results = new ArrayList<>();
        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
            // 指定订单
            Order order = orderService.selectByNo(param.getOrderNo());
            OrderPakin order = orderService.selectByNo(param.getOrderNo());
            if (null != order) {
                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                results.add(result);
                result.setOrderNo(order.getOrderNo());
                result.setOrderTime(order.getOrderTime());
                result.setOrderType(order.getDocType$());
                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetl orderDetl : orderDetls) {
                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
                List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
                    result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
                }
                if (order.getSettle() == 4L) {
                    // 修改订单状态 4.完成 ===>> 6.已上报
@@ -357,16 +353,16 @@
            }
        } else {
            // 所有订单
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
            for (Order order : orders) {
            List<OrderPakin> orders = orderService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
            for (OrderPakin order : orders) {
                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                results.add(result);
                result.setOrderNo(order.getOrderNo());
                result.setOrderTime(order.getOrderTime());
                result.setOrderType(order.getDocType$());
                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetl orderDetl : orderDetls) {
                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
                List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
                for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
                    result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
                }
                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
@@ -383,134 +379,18 @@
        return locDetlService.queryStockTotal();
    }

    @Override
    @Transactional
    public void packageUp(PackParam param) {
        if (Cools.isEmpty(param.getBarcode())) {
            throw new CoolException("barcode不能为空");
        }
        Mat analyse = MatUtils.analyseMat(param.getBarcode());
        Pack pack = packService.selectByBarcode(param.getBarcode());
        if (null != pack) {
            throw new CoolException(param.getBarcode() + "重复提交");
        }
        Date now = new Date();
        pack = new Pack(
                param.getBarcode(),    // 条码[非空]
                analyse.getMatnr(),    // 商品编号
                analyse.getBarcode(),    // 序列码
                1L,    // 订单状态
                1,    // 状态
                now,    // 添加时间
                null,    // 添加人员
                now,    // 修改时间
                null,    // 修改人员
                null    // 备注
        );
        if (!packService.insert(pack)) {
            throw new CoolException("服务器内部错误，请联系管理员");
        }

        Mat mat = matService.selectByMatnr(analyse.getMatnr());
        if (mat == null) {
            mat = new Mat();
            // 分类
            Long tagId;
            // 一级分类
            if (!Cools.isEmpty(param.getGroupCode()) && !Cools.isEmpty(param.getGroupName())) {
                Tag priTag = tagService.selectByName(param.getGroupCode(), 2);
                if (priTag == null) {
                    Tag top = tagService.getTop();
                    NodeUtils nodeUtils = new NodeUtils();
                    nodeUtils.executePath(top.getId());
                    priTag = new Tag(
                            null,    // 编号
                            param.getGroupCode(),    // 名称
                            top.getId(),    // 父级
                            top.getName(),    // 父级名称
                            nodeUtils.path.toString(),    // 关联路径
                            nodeUtils.pathName.toString(),    // 关联路径名
                            0,    // 类型
                            null,    // 负责人
                            null,    // 图片
                            null,    // 简要描述
                            null,    // 数量
                            2,    // 等级
                            null,    // 排序
                            1,    // 状态
                            now,    // 添加时间
                            null,    // 添加人员
                            now,    // 修改时间
                            null,    // 修改人员
                            null    // 备注
                    );
                    if (tagMapper.insert(priTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                }
                // 二级分类
                Tag secTag = tagService.selectByName(param.getGroupName(), 3);
                if (secTag == null) {
                    NodeUtils nodeUtils = new NodeUtils();
                    nodeUtils.executePath(priTag.getId());
                    secTag = new Tag(
                            null,    // 编号
                            param.getGroupName(),    // 名称
                            priTag.getId(),    // 父级
                            priTag.getName(),    // 父级名称
                            nodeUtils.path.toString(),    // 关联路径
                            nodeUtils.pathName.toString(),    // 关联路径名
                            0,    // 类型
                            null,    // 负责人
                            null,    // 图片
                            null,    // 简要描述
                            null,    // 数量
                            3,    // 等级
                            null,    // 排序
                            1,    // 状态
                            now,    // 添加时间
                            null,    // 添加人员
                            now,    // 修改时间
                            null,    // 修改人员
                            null    // 备注
                    );
                    if (tagMapper.insert(secTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                }
                tagId = secTag.getId();
            } else {
                tagId = tagService.getTop().getId();
            }
            mat.setTagId(tagId);
            mat.setMatnr(analyse.getMatnr());
            mat.setMaktx(param.getMaterialName());
            mat.setSpecs(param.getConfigureDesc());
            mat.setModel(analyse.getModel());
            mat.setStatus(1);
            mat.setCreateTime(now);
            mat.setUpdateTime(now);
            if (!matService.insert(mat)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            } else {
                log.info("打包上线添加新物料[商品编号：{}]", mat.getMatnr());
            }
        }
    }

    @Override
    @Transactional
    public void syncMat(MatSyncParam param) {
        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
            throw new CoolException("商品数据为空");
        }





        for(MatSyncParam.MatParam matParam : param.getMatDetails()){
            if(Cools.isEmpty(matParam.getMatnr())){
        for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
            if (Cools.isEmpty(matParam.getMatnr())) {
                throw new CoolException("商品编码不能为空");
            }

@@ -605,14 +485,10 @@
            } else {
                mat.sync(matParam);
                mat.setTagId(tagId);
                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
                    throw new CoolException("更新已存在商品信息失败，请联系管理员");
                }
            }






            //Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", matParam.getTagId()));
@@ -652,8 +528,8 @@
    public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
        ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
        EntityWrapper<WrkMastLog> wrkMastLogEntityWrapper = new EntityWrapper<>();
        wrkMastLogEntityWrapper.ge("modi_time",param.getStartTime());
        wrkMastLogEntityWrapper.le("modi_time",param.getEndTime());
        wrkMastLogEntityWrapper.ge("modi_time", param.getStartTime());
        wrkMastLogEntityWrapper.le("modi_time", param.getEndTime());
//        wrkMastLogEntityWrapper.isNotNull("sheet_no");
        wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
            if (wrkMastLog.getWrkSts() == 5 || wrkMastLog.getWrkSts() == 15) {
@@ -662,15 +538,15 @@
                wrkDetlLogs.forEach(wrkDetlLog -> {
                    if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
                        LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
                        if (!Cools.isEmpty(wrkDetlLog.getOrderNo())){
                            Order order = orderService.selectByNo(wrkDetlLog.getOrderNo());
                        if (!Cools.isEmpty(wrkDetlLog.getOrderNo())) {
                            OrderPakin order = orderService.selectByNo(wrkDetlLog.getOrderNo());
                            if (!Cools.isEmpty(order)) {
                                locDetlByTimeDTO.setDate(order.getOrderTime());
                                locDetlByTimeDTO.setWarehouse(order.getItemName());
                                locDetlByTimeDTO.setOrderType(order.getDocType$());
                            }
                            locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
                            locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
                            locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() < 100 ? wrkMastLog.getLocNo() : wrkMastLog.getSourceLocNo());
                            locDetlByTimeDTO.setBatch(wrkDetlLog.getBatch());
                            locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
                            locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo());
@@ -720,11 +596,11 @@
    @Transactional
    public void syncTag(List<TagParam> param) {

        param.forEach(tag-> {
        param.forEach(tag -> {
            // 分类
            Long tagId;
            Date now = new Date();
            if (Cools.isEmpty(tag.getParentItemClassId())){
            if (Cools.isEmpty(tag.getParentItemClassId())) {
                Tag priTag = tagService.selectByName("全部", 1);

                // 二级分类
@@ -757,8 +633,8 @@
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                }
            }else {
                Tag priTag =tagService.selectOne(new EntityWrapper<Tag>().eq("memo", tag.getParentItemClassId()));
            } else {
                Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", tag.getParentItemClassId()));
                if (priTag == null) {
                    Tag top = tagService.getTop();
                    NodeUtils nodeUtils = new NodeUtils();
@@ -818,7 +694,7 @@
                    if (tagMapper.insert(secTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                }else {
                } else {
                    secTag.setName(tag.getName());
                    secTag.setParentId(priTag.getId());
                    secTag.setParentName(priTag.getName());
@@ -831,15 +707,13 @@
                    List<Tag> tags = tagService.selectList(new EntityWrapper<Tag>().eq("parent_id", secTag.getId()));
                    if (!Cools.isEmpty(tags)) {
                        for (Tag tag1 : tags) {
                            tag1.setPath(nodeUtils.path.toString()+","+secTag.getId());
                            tag1.setPathName(nodeUtils.pathName.toString()+","+secTag.getName());
                            tag1.setPath(nodeUtils.path.toString() + "," + secTag.getId());
                            tag1.setPathName(nodeUtils.pathName.toString() + "," + secTag.getName());
                            if (tagMapper.updateById(tag1) == 0) {
                                throw new CoolException("服务器内部错误，请联系管理员");
                            }
                        }
                    }




                }
@@ -848,20 +722,21 @@
            }
        });
    }

    @Transactional
    @Override
    public void orderDelete(String orderNo) {
        Order order = orderService.selectByNo(orderNo);
        OrderPakin order = orderService.selectByNo(orderNo);
        if (order == null) {
            throw new CoolException("未查询到对应订单信息");
        }
        if (order.getSettle() != 1){
        if (order.getSettle() != 1) {
            throw new CoolException("该订单已有对应任务，禁止删除");
        }
        List<OrderDetl> OrderDetl = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
        if (!Cools.isEmpty(OrderDetl)) {
            orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
        List<OrderDetlPakout> OrderDetlPakout = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
        if (!Cools.isEmpty(OrderDetlPakout)) {
            orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
        }
        orderService.delete(new EntityWrapper<Order>().eq("order_no", orderNo));
        orderService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
    }
}

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

@@ -1,18 +1,10 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlReport;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderDetlReportMapper;
import com.zy.asrs.service.OrderDetlReportService;
import com.zy.asrs.service.OrderDetlService;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("orderDetlReportService")
public class OrderDetlReportServiceImpl extends ServiceImpl<OrderDetlReportMapper, OrderDetlReport> implements OrderDetlReportService {

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

@@ -2,46 +2,46 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.OrderDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.OrderDetlService;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("orderDetlService")
public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetlPakout> implements OrderDetlService {

    @Override
    public List<OrderDetl> selectByOrderId(Long orderId) {
        return this.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
    public List<OrderDetlPakout> selectByOrderId(Long orderId) {
        return this.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
    }

    @Override
    public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
    public Page<OrderDetlPakout> getPakoutPage(Page<OrderDetlPakout> page) {
        page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
        page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
        return page;
    }

    @Override
    public OrderDetl selectItem(Long orderId, String matnr, String batch) {
    public OrderDetlPakout selectItem(Long orderId, String matnr, String batch) {
        return this.baseMapper.selectItem(orderId, matnr, batch);
    }

    @Override
    public OrderDetl selectItem(String orderNo, String matnr, String batch) {
    public OrderDetlPakout selectItem(String orderNo, String matnr, String batch) {
        return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
    }

    @Override
    public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
        for (OrderDetl orderDetl : orderDetls) {
            if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) {
                if (Cools.eq(batch, orderDetl.getBatch())) {
                    return orderDetl;
    public OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetlPakouts, Long orderId, String matnr, String batch) {
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            if (orderDetlPakout.getOrderId().equals(orderId) && orderDetlPakout.getMatnr().equals(matnr)) {
                if (Cools.eq(batch, orderDetlPakout.getBatch())) {
                    return orderDetlPakout;
                }
            }
        }
@@ -69,8 +69,8 @@
    }

    @Override
    public boolean addToLogTable(OrderDetl orderDetl) {
        return this.baseMapper.addToLogTable(orderDetl) > 0;
    public boolean addToLogTable(OrderDetlPakout orderDetlPakout) {
        return this.baseMapper.addToLogTable(orderDetlPakout) > 0;
    }

    @Override
@@ -80,6 +80,7 @@

    /**
     * 入出库任务生成时，更新单据表中作业数量
     *
     * @param orderId
     * @param matnr
     * @param batch
@@ -88,11 +89,11 @@
     */
    @Override
    public boolean increaseWorkQty(Long id, String matnr, String batch, Double workQty) {
        return this.baseMapper.increaseWorkQty(id,  matnr,batch,workQty) > 0;
        return this.baseMapper.increaseWorkQty(id, matnr, batch, workQty) > 0;
    }

    @Override
    public boolean increaseWorkQtyById(Long id, Double workQty) {
        return this.baseMapper.increaseWorkQtyById(id,  workQty) > 0;
        return this.baseMapper.increaseWorkQtyById(id, workQty) > 0;
    }
}

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

@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
@@ -11,7 +12,6 @@
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@

@Slf4j
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderPakin> implements OrderService {

    @Autowired
    private OrderDetlMapper orderDetlMapper;
@@ -38,8 +38,8 @@
    private WrkDetlService wrkDetlService;

    @Override
    public Order selectByNo(String orderNo) {
        List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("order_no", orderNo));
    public OrderPakin selectByNo(String orderNo) {
        List<OrderPakin> orderList = this.selectList(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
        if (Cools.isEmpty(orderList)) {
            return null;
        }
@@ -47,7 +47,7 @@
    }

    @Override
    public List<OrderDetl> selectWorkingDetls(Long orderId) {
    public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
        return orderDetlMapper.selectWorkingDetls(orderId);
    }

@@ -58,14 +58,14 @@

    @Override
    public void checkComplete(String orderNo) {
        Order order = this.selectByNo(orderNo);
        OrderPakin order = this.selectByNo(orderNo);
        if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
            return;
        }
        List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
        List<OrderDetlPakout> orderDetlPakouts = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
        boolean complete = true;
        for (OrderDetl orderDetl : orderDetls) {
            if (orderDetl.getAnfme() > orderDetl.getQty()) {
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            if (orderDetlPakout.getAnfme() > orderDetlPakout.getQty()) {
                complete = false;
                break;
            }
@@ -74,22 +74,22 @@
            // 出库订单重新整理明细
            DocType docType = docTypeService.selectById(order.getDocType());
            if (null != docType && docType.getPakout() == 1) {
                if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
                if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                }
                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
                for (WrkDetl wrkDetl : wrkDetls) {
                    OrderDetl orderDetl = new OrderDetl();
                    orderDetl.sync(wrkDetl);
                    orderDetl.setQty(orderDetl.getAnfme());
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(orderNo);
                    orderDetl.setStatus(1);
                    orderDetl.setCreateTime(order.getCreateTime());
                    orderDetl.setCreateBy(order.getCreateBy());
                    orderDetl.setUpdateTime(order.getUpdateTime());
                    orderDetl.setUpdateBy(order.getUpdateBy());
                    if (!orderDetlService.insert(orderDetl)) {
                    OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
                    orderDetlPakout.sync(wrkDetl);
                    orderDetlPakout.setQty(orderDetlPakout.getAnfme());
                    orderDetlPakout.setOrderId(order.getId());
                    orderDetlPakout.setOrderNo(orderNo);
                    orderDetlPakout.setStatus(1);
                    orderDetlPakout.setCreateTime(order.getCreateTime());
                    orderDetlPakout.setCreateBy(order.getCreateBy());
                    orderDetlPakout.setUpdateTime(order.getUpdateTime());
                    orderDetlPakout.setUpdateBy(order.getUpdateBy());
                    if (!orderDetlService.insert(orderDetlPakout)) {
                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                    }
                }
@@ -128,7 +128,7 @@
                openService.pakoutOrderCreate(openParam);
            }

            Order order = this.selectByNo(orderNo);
            OrderPakin order = this.selectByNo(orderNo);
            if (null == order) {
                throw new CoolException("生成单据失败");
            }
@@ -157,35 +157,36 @@
        if (!this.deleteById(orderId)) {
            throw new CoolException("删除单据失败");
        }
        orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
        orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
    }

    @Override
    public List<Order> selectComplete() {
    public List<OrderPakin> selectComplete() {
        return this.baseMapper.selectComplete();
    }

    @Override
    public List<Order> selectComplete8() {
    public List<OrderPakin> selectComplete8() {
        return this.baseMapper.selectComplete8();
    }

    @Override
    public boolean addToLogTable(Order order) {
    public boolean addToLogTable(OrderPakin order) {
        return this.baseMapper.addToLogTable(order) > 0;
    }

    @Override
    public List<Order> selectorderNoL(String orderNo) {
    public List<OrderPakin> selectorderNoL(String orderNo) {
        return this.baseMapper.selectorderNoL(orderNo);
    }

    @Override
    public Order selectOrderMoveStatus() {
    public OrderPakin selectOrderMoveStatus() {
        return this.baseMapper.selectOrderMoveStatus();
    }

    @Override
    public Order selectOrderMoveStatusInitial() {
    public OrderPakin selectOrderMoveStatusInitial() {
        return this.baseMapper.selectOrderMoveStatusInitial();
    }


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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.OrderSettleMapper;
import com.zy.asrs.entity.OrderSettle;
import com.zy.asrs.service.OrderSettleService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.OrderSettle;
import com.zy.asrs.mapper.OrderSettleMapper;
import com.zy.asrs.service.OrderSettleService;
import org.springframework.stereotype.Service;

@Service("orderSettleService")

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

File was deleted

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

File was deleted

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

@@ -23,18 +23,18 @@
        if (Cools.isEmpty(wrk_mk)) {
            this.baseMapper.updateInitWrkMk();
            return 1;
        }else {
        } else {
            int i = this.selectCount(null);
            if (wrk_mk.getWhsType() >= i){
            if (wrk_mk.getWhsType() >= i) {
                this.baseMapper.updateInitWrkMk();
                wrk_mk.setWrkMk("0");
                this.update(wrk_mk,new EntityWrapper<RowLastno>()
                        .eq("whs_type",wrk_mk.getWhsType()));
            }else {
                this.baseMapper.updateNextWrkMk(wrk_mk.getWhsType()+1);
                this.update(wrk_mk, new EntityWrapper<RowLastno>()
                        .eq("whs_type", wrk_mk.getWhsType()));
            } else {
                this.baseMapper.updateNextWrkMk(wrk_mk.getWhsType() + 1);
                wrk_mk.setWrkMk("0");
                this.update(wrk_mk,new EntityWrapper<RowLastno>()
                        .eq("whs_type",wrk_mk.getWhsType()));
                this.update(wrk_mk, new EntityWrapper<RowLastno>()
                        .eq("whs_type", wrk_mk.getWhsType()));
            }
            return wrk_mk.getWhsType();
        }

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.RowLastnoTypeMapper;
import com.zy.asrs.entity.RowLastnoType;
import com.zy.asrs.service.RowLastnoTypeService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.RowLastnoType;
import com.zy.asrs.mapper.RowLastnoTypeMapper;
import com.zy.asrs.service.RowLastnoTypeService;
import org.springframework.stereotype.Service;

@Service("rowLastnoTypeService")

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

@@ -3,10 +3,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import org.springframework.stereotype.Service;
import com.zy.asrs.entity.Tag;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.TagService;
import org.springframework.stereotype.Service;

@Service("tagService")
public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.TaskDetlLog;
import com.zy.asrs.mapper.TaskDetlLogMapper;
import com.zy.asrs.service.TaskDetlLogService;
import org.springframework.stereotype.Service;

@Service("taskDetlLogService")
public class TaskDetlLogServiceImpl extends ServiceImpl<TaskDetlLogMapper, TaskDetlLog> implements TaskDetlLogService {

}

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.TaskDetl;
import com.zy.asrs.mapper.TaskDetlMapper;
import com.zy.asrs.service.TaskDetlService;
import org.springframework.stereotype.Service;

@Service("taskDetlService")
public class TaskDetlServiceImpl extends ServiceImpl<TaskDetlMapper, TaskDetl> implements TaskDetlService {

}

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.TaskLog;
import com.zy.asrs.mapper.TaskLogMapper;
import com.zy.asrs.service.TaskLogService;
import org.springframework.stereotype.Service;

@Service("taskLogService")
public class TaskLogServiceImpl extends ServiceImpl<TaskLogMapper, TaskLog> implements TaskLogService {

}

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.Task;
import com.zy.asrs.mapper.TaskMapper;
import com.zy.asrs.service.TaskService;
import org.springframework.stereotype.Service;

@Service("taskService")
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {

}

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.TrayCodeMapper;
import com.zy.asrs.entity.TrayCode;
import com.zy.asrs.service.TrayCodeService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.TrayCode;
import com.zy.asrs.mapper.TrayCodeMapper;
import com.zy.asrs.service.TrayCodeService;
import org.springframework.stereotype.Service;

@Service("trayCodeService")

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.WaitPakinLogMapper;
import com.zy.asrs.entity.WaitPakinLog;
import com.zy.asrs.service.WaitPakinLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.WaitPakinLog;
import com.zy.asrs.mapper.WaitPakinLogMapper;
import com.zy.asrs.service.WaitPakinLogService;
import org.springframework.stereotype.Service;

@Service("waitPakinLogService")

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.service.WaitPakinService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.service.WaitPakinService;
import org.springframework.stereotype.Service;

@Service("waitPakinService")

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

@@ -182,10 +182,10 @@
                if (staNo.getDevNo() == 1135 && locMast.getLocType1() == 2) {
                    throw new CoolException("所选库位不是低库位无法调拨，库位号：{}" + locMast.getLocNo());
                }
                if(staNo.getDevNo()>=1100){
                if (staNo.getDevNo() >= 1100) {
                    // 启动出库开始 101.出库
                    stockOut(staNo, locDetlDtos, null, userId);
                }else {
                } else {
                    stockOutSXK(staNo, locDetlDtos, null, userId);
                }
            } else {
@@ -385,7 +385,6 @@
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {



                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
                    continue;
                }
@@ -471,12 +470,12 @@
            if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
                continue;
            }
            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
            if (orderDetl == null) {
                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
            OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
            if (orderDetlPakout == null) {
                orderDetlPakout = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
            }
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(orderDetl);
            wrkDetl.sync(orderDetlPakout);
            wrkDetl.setZpallet(wrkMast.getBarcode());
            wrkDetl.setIoTime(now);
            wrkDetl.setWrkNo(workNo);
@@ -491,10 +490,10 @@
                throw new CoolException("保存工作档明细失败");
            }
            // 修改订单明细
            if (!orderDetlService.increaseWorkQtyById(orderDetl.getId(),  locDto.getAnfme())) {
            if (!orderDetlService.increaseWorkQtyById(orderDetlPakout.getId(), locDto.getAnfme())) {
                throw new CoolException("修改订单明细数量失败");
            }
            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
            orderService.updateSettle(orderDetlPakout.getOrderId(), 2L, userId);
        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        locMast = locMastService.selectById(taskDto.getLocNo());
@@ -524,10 +523,10 @@
        LocMast locMast = locMastService.selectById(taskDto.getLocNo());

        List<LocMast> locMasts = new ArrayList<>();
        if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6) ) {
        if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6)) {
            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", locMast.getBay1())
                    .in("bay1", 3,4,5,6)
                    .in("bay1", 3, 4, 5, 6)
                    .eq("crn_no", 7)
                    .eq("loc_type1", locMast.getLocType1())
                    .orderBy("bay1", true));
@@ -579,12 +578,12 @@
            if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
                continue;
            }
            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
            if (orderDetl == null) {
                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
            OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
            if (orderDetlPakout == null) {
                orderDetlPakout = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
            }
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(orderDetl);
            wrkDetl.sync(orderDetlPakout);
            wrkDetl.setZpallet(wrkMast.getBarcode());
            wrkDetl.setIoTime(now);
            wrkDetl.setWrkNo(workNo);
@@ -599,10 +598,10 @@
                throw new CoolException("保存工作档明细失败");
            }
            // 修改订单明细
            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
            if (!orderDetlService.increaseWorkQty(orderDetlPakout.getOrderId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), locDto.getAnfme())) {
                throw new CoolException("修改订单明细数量失败");
            }
            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
            orderService.updateSettle(orderDetlPakout.getOrderId(), 2L, userId);
        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        locMast = locMastService.selectById(taskDto.getLocNo());
@@ -1045,7 +1044,6 @@
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {



                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
                    continue;
                }
@@ -1170,7 +1168,7 @@
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }
        if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 5||wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
        if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
            throw new CoolException("当前工作档已完成");
        }
        // 入库 + 库位转移
@@ -1200,7 +1198,7 @@
        if (Cools.isEmpty(locMast)) {
            throw new CoolException("库位不存在");
        }
        if (!(locMast.getLocSts().equals("P") ||locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O"))) {
        if (!(locMast.getLocSts().equals("P") || locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O"))) {
            throw new CoolException("当前库位不可调整！库位状态：" + locMast.getLocSts$());
        }

@@ -1312,7 +1310,7 @@
        }
        locMast.setModiUser(userId);
        locMast.setModiTime(now);
        if (locMast.getLocSts().equals("O")){
        if (locMast.getLocSts().equals("O")) {
            locMast.setBarcode("");
        }
        if (!locMastService.updateById(locMast)) {
@@ -1403,20 +1401,20 @@

                    //修改订单主表状态,没有作业数量时才可以修改
                    boolean flag = true;
                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo()));
                    for (OrderDetl orderDetl : orderDetls) {
                        if (orderDetl.getWorkQty() > 0) {
                    List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo()));
                    for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
                        if (orderDetlPakout.getWorkQty() > 0) {
                            flag = false;
                        }
                    }
                    if (flag) {
                        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()));
                        OrderPakin order = orderService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", wrkDetl.getOrderNo()));
                        if (!Cools.isEmpty(order) && order.getSettle() == 2) {
                            order.setSettle(1L);
                            order.setUpdateBy(userId);
                            order.setUpdateTime(now);
                        }
                        if (!orderService.update(order, new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()))) {
                        if (!orderService.update(order, new EntityWrapper<OrderPakin>().eq("order_no", wrkDetl.getOrderNo()))) {
                            throw new CoolException("修改订单状态失败");
                        }
                    }
@@ -1773,10 +1771,10 @@
//                    moveLocForDeepLoc(locMast1);
//                }
//            }
            if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6) ) {
            if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6)) {
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", locMast.getBay1())
                        .in("bay1", 3,4,5,6)
                        .in("bay1", 3, 4, 5, 6)
                        .eq("crn_no", 7)
                        .eq("loc_type1", locMast.getLocType1())
                        .orderBy("bay1", true));

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

@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.WrkDetlLogMapper;
import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.service.WrkDetlLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.mapper.WrkDetlLogMapper;
import com.zy.asrs.service.WrkDetlLogService;
import org.springframework.stereotype.Service;

import java.util.Date;
@@ -18,12 +18,12 @@
    }

    @Override
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, modiTimeStart, modiTimeEnd, curr, limit);
    }

    @Override
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd);
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, modiTimeStart, modiTimeEnd);
    }
}

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

@@ -25,12 +25,12 @@
    @Override
    @Transactional
    public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId, Date now) {
        if (detlDtos.isEmpty()){
        if (detlDtos.isEmpty()) {
            return;
        }
        for (DetlDto dto : detlDtos) {
            Mat mat = matService.selectByMatnr(dto.getMatnr());
            if (Cools.isEmpty(mat)){
            if (Cools.isEmpty(mat)) {
                throw new CoolException(dto.getMatnr() + "商品维护失败");
            }
            // 保持工作档明细
@@ -84,6 +84,7 @@
    public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
        return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
    }

    @Override
    public boolean updateIoTimeWms(Integer workNo, Date ioTime) {
        return this.baseMapper.updateIoTimeWms(workNo, ioTime) > 0;
@@ -93,6 +94,7 @@
    public boolean updateIoTime(Integer workNo, Date ioTime) {
        return this.baseMapper.updateIoTime(workNo, ioTime) > 0;
    }

    @Override
    public List<WrkDetl> findByWorkNo(Integer workNo) {
        return this.baseMapper.findByWorkNo(workNo);

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

@@ -9,7 +9,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

@Slf4j
@@ -47,17 +46,17 @@
    }

    @Override
    public int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo) {
        return this.baseMapper.selectWrkMastBareBoardStaNo(ioType,staNo);
    public int selectWrkMastBareBoardStaNo(Integer ioType, Integer staNo) {
        return this.baseMapper.selectWrkMastBareBoardStaNo(ioType, staNo);
    }

    @Override
    public List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade ,Integer crnNo) {
        return this.baseMapper.selectWrkMastWrkDetlMatnrBatch(ioType,matnr,batch,grade,crnNo);
    public List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType, String matnr, String batch, String grade, Integer crnNo) {
        return this.baseMapper.selectWrkMastWrkDetlMatnrBatch(ioType, matnr, batch, grade, crnNo);
    }

    @Override
    public int saveWrkMastLog(Integer workNo){
    public int saveWrkMastLog(Integer workNo) {
        return this.baseMapper.saveWrkMastLog(workNo);
    }


 src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.AutoLocMoveHandler;
@@ -47,7 +47,7 @@
            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
                return;
            }
            Order order = orderService.selectOrderMoveStatus();
            OrderPakin order = orderService.selectOrderMoveStatus();
            if (!Cools.isEmpty(order)) {
//                autoMoveService.selectList()
            } else {

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.entity.OrderDetlReport;
import com.zy.asrs.entity.OrderDetlReportLog;
import com.zy.asrs.service.ApiLogService;
@@ -52,7 +52,7 @@
        try {
            List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>());
            for (OrderDetlReport orderDetl : orderDetls) {
                Order order = orderService.selectByNo(orderDetl.getOrderNo());
                OrderPakin order = orderService.selectByNo(orderDetl.getOrderNo());
                if (order == null) {
                    OrderDetlReportLog orderDetlReportLog = new OrderDetlReportLog();
                    orderDetlReportLog.sync(orderDetl);
@@ -71,8 +71,8 @@
    public void completeAndReport() {
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();
            for (Order order : orders) {
            List<OrderPakin> orders = orderService.selectComplete();
            for (OrderPakin order : orders) {
                ReturnT<String> result = orderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());

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

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.OrderDetlReport;
import com.zy.asrs.entity.OrderDetlReportLog;
import com.zy.asrs.service.OrderDetlReportLogService;
@@ -32,12 +32,12 @@
    private OrderDetlReportService orderDetlReportService;

    public ReturnT<String> start() {
        List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
        List<OrderPakin> settleEqual6 = orderService.selectList(new EntityWrapper<OrderPakin>()
                .eq("settle", 6));
        for (Order order : settleEqual6) {
            List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
        for (OrderPakin order : settleEqual6) {
            List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>()
                    .eq("order_no", order.getOrderNo()));
            moveBoth(order, orderDetls);
            moveBoth(order, orderDetlPakouts);
            List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
            for (OrderDetlReport orderDetlReport : orderNo) {
                OrderDetlReportLog log = new OrderDetlReportLog();
@@ -50,22 +50,22 @@
        return SUCCESS;
    }

    private void moveBoth(Order order, List<OrderDetl> orderDetls) {
    private void moveBoth(OrderPakin order, List<OrderDetlPakout> orderDetlPakouts) {
        Date now = new Date();
        if (!Cools.isEmpty(orderDetls)) {
            for (OrderDetl orderDetl : orderDetls) {
                orderDetl.setUpdateBy(0L);
                orderDetl.setUpdateTime(now);
                orderDetlService.addToLogTable(orderDetl);
                orderDetlService.delete(new EntityWrapper<OrderDetl>()
                        .eq("id", orderDetl.getId()));
        if (!Cools.isEmpty(orderDetlPakouts)) {
            for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
                orderDetlPakout.setUpdateBy(0L);
                orderDetlPakout.setUpdateTime(now);
                orderDetlService.addToLogTable(orderDetlPakout);
                orderDetlService.delete(new EntityWrapper<OrderDetlPakout>()
                        .eq("id", orderDetlPakout.getId()));
            }
        }
        if (!Cools.isEmpty(order)) {
            order.setUpdateBy(0L);
            order.setUpdateTime(now);
            orderService.addToLogTable(order);
            orderService.delete(new EntityWrapper<Order>()
            orderService.delete(new EntityWrapper<OrderPakin>()
                    .eq("id", order.getId()));
        }
    }

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

@@ -1,27 +1,15 @@
package com.zy.asrs.task.handler;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetlReport;
import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;

/**
 * Created by vincent on 2020/7/7
@@ -50,7 +38,7 @@
    private String pakin;

    @Transactional
    public ReturnT<String> start(Order order) {
    public ReturnT<String> start(OrderPakin order) {

        return SUCCESS;
    }

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

@@ -138,14 +138,14 @@
                        }

                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetl == null) {
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                        OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetlPakout == null) {
                            orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                        }
                        try {
                            if (!Cools.isEmpty(orderDetl)) {
                            if (!Cools.isEmpty(orderDetlPakout)) {
                                if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(), wrkDetl.getAnfme())) {
                                        orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
//                                    exceptionHandle("全板入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -192,14 +192,14 @@
                        }

                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetl == null) {
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                        OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetlPakout == null) {
                            orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                        }
                        try {
                            if (!Cools.isEmpty(orderDetl)) {
                            if (!Cools.isEmpty(orderDetlPakout)) {
                                if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(), wrkDetl.getAnfme())) {
                                        orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
//                                    exceptionHandle("拣料入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -259,14 +259,14 @@
                            }
                            if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                                // 更新订单完成数量
                                OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                                if (orderDetl == null) {
                                    orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                                OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                                if (orderDetlPakout == null) {
                                    orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                                }
                                try {
                                    if (!Cools.isEmpty(orderDetl)) {
                                    if (!Cools.isEmpty(orderDetlPakout)) {
                                        if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                                orderDetl.getBatch(), wrkDetl.getAnfme())) {
                                                orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
//                                    exceptionHandle("全板入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -418,14 +418,14 @@
                        }
                        for (WrkDetl wrkDetl : wrkDetls101) {
                            // 更新订单完成数量
                            OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                            if (orderDetl == null) {
                                orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                            OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                            if (orderDetlPakout == null) {
                                orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                            }
                            try {
                                if (!Cools.isEmpty(orderDetl)) {
                                if (!Cools.isEmpty(orderDetlPakout)) {
                                    if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                            orderDetl.getBatch(), wrkDetl.getAnfme())) {
                                            orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
//                                    exceptionHandle("全板出库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -520,14 +520,14 @@
                    }
                    for (WrkDetl wrkDetl : wrkDetls101) {
                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetl == null) {
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                        OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetlPakout == null) {
                            orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                        }
                        try {
                            if (!Cools.isEmpty(orderDetl)) {
                            if (!Cools.isEmpty(orderDetlPakout)) {
                                if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(), wrkDetl.getAnfme())) {
                                        orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
//                                    exceptionHandle("全板出库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -12,7 +12,6 @@

import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

/**

 src/main/java/com/zy/common/model/DetlDto.java

@@ -1,7 +1,7 @@
package com.zy.common.model;

import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import lombok.Data;

import java.util.List;
@@ -81,15 +81,15 @@
        this.anfme = anfme;
    }

    public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
    public static boolean hasList(Set<DetlDto> detlDtos, OrderDetlPakout orderDetlPakout) {
        for (DetlDto dto : detlDtos) {
            if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
                if (dto.getMatnr().equals(orderDetl.getMatnr())) {
            if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetlPakout.getBatch())) {
                if (dto.getMatnr().equals(orderDetlPakout.getMatnr())) {
                    return true;
                }
            } else {
                if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
                    if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
                if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetlPakout.getBatch())) {
                    if (dto.getMatnr().equals(orderDetlPakout.getMatnr()) && dto.getBatch().equals(orderDetlPakout.getBatch())) {
                        return true;
                    }
                }

 src/main/java/com/zy/common/web/WcsController.java

@@ -125,16 +125,16 @@
                        total = locDetl.getAnfme();
                    }
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo())
                        OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo())
                                .eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
                        }
                        if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
                        }
                    } else {
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
@@ -237,16 +237,16 @@
                        total = locDetl.getAnfme();
                    }
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo())
                        OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo())
                                .eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
                        }
                        if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
                        }
                    } else {
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {

 src/main/resources/mapper/BasStationMapper.xml

New file
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.BasStationMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasStation">
        <id column="id" property="id" />
        <result column="dev_no" property="devNo" />
        <result column="dec_desc" property="decDesc" />
        <result column="dev_mk" property="devMk" />
        <result column="in_enable" property="inEnable" />
        <result column="out_enable" property="outEnable" />
        <result column="autoing" property="autoing" />
        <result column="loading" property="loading" />
        <result column="loc_sts" property="locSts" />
        <result column="canining" property="canining" />
        <result column="canouting" property="canouting" />
        <result column="fronting" property="fronting" />
        <result column="rearing" property="rearing" />
        <result column="uping" property="uping" />
        <result column="downing" property="downing" />
        <result column="wrk_no" property="wrkNo" />
        <result column="ctn_type" property="ctnType" />
        <result column="barcode" property="barcode" />
        <result column="in_qty" property="inQty" />
        <result column="row1" property="row1" />
        <result column="io_time" property="ioTime" />
        <result column="area" property="area" />
        <result column="in_ok" property="inOk" />
        <result column="out_ok" property="outOk" />
        <result column="loc_type1" property="locType1" />
        <result column="loc_type2" property="locType2" />
        <result column="loc_type3" property="locType3" />
        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="std_qty" property="stdQty" />
        <result column="min_wt" property="minWt" />
        <result column="gross_wt" property="grossWt" />

    </resultMap>

</mapper>

 src/main/resources/mapper/BasWhsTypeMapper.xml

File was renamed from src/main/resources/mapper/BasWhsMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.BasWhsMapper">
<mapper namespace="com.zy.asrs.mapper.BasWhsTypeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWhs">
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWhsType">
        <id column="id" property="id" />
        <result column="whs_desc" property="whsDesc" />
        <result column="modi_user" property="modiUser" />

 src/main/resources/mapper/LocCacheMapper.xml

New file
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.LocCacheMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocCache">
        <result column="loc_no" property="locNo" />
        <result column="whs_type" property="whsType" />
        <result column="loc_sts" property="locSts" />
        <result column="row1" property="row1" />
        <result column="bay1" property="bay1" />
        <result column="lev1" property="lev1" />
        <result column="full_plt" property="fullPlt" />
        <result column="loc_type" property="locType" />
        <result column="loc_type1" property="locType1" />
        <result column="loc_type2" property="locType2" />
        <result column="loc_type3" property="locType3" />
        <result column="out_enable" property="outEnable" />
        <result column="io_time" property="ioTime" />
        <result column="first_time" property="firstTime" />
        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="barcode" property="barcode" />
        <result column="frozen" property="frozen" />
        <result column="frozen_memo" property="frozenMemo" />

    </resultMap>

</mapper>

 src/main/resources/mapper/OrderDetlPakinMapper.xml

File was renamed from src/main/resources/mapper/OrderDetlMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.zy.asrs.mapper.OrderDetlMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetl">
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetlPakout">
        <id column="id" property="id" />
        <result column="order_id" property="orderId" />
        <result column="order_no" property="orderNo" />
@@ -53,7 +53,7 @@
    </resultMap>

    <select id="selectItem" resultMap="BaseResultMap">
        select top 1 * from man_order_detl
        select top 1 * from man_order_detl_pakin
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
@@ -68,7 +68,7 @@
    </select>

    <select id="selectItemByOrderNo" resultMap="BaseResultMap">
        select * from man_order_detl
        select * from man_order_detl_pakin
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}
@@ -78,7 +78,7 @@
    </select>

    <select id="selectWorkingDetls" resultMap="BaseResultMap">
        select * from man_order_detl
        select * from man_order_detl_pakin
        where 1=1
        and order_id = #{orderId}
        and qty &lt; anfme
@@ -105,7 +105,7 @@
            select
            ROW_NUMBER() over (order by mo.create_time desc) as row,
            mod.*
            from man_order_detl mod
            from man_order_detl_pakin mod
            inner join man_order mo on mod.order_id = mo.id
            inner join man_doc_type mdt on mo.doc_type = mdt.doc_id
            where 1=1
@@ -119,7 +119,7 @@
    <select id="getPakoutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
        select
        count(1)
        from man_order_detl mod
        from man_order_detl_pakin mod
        inner join man_order mo on mod.order_id = mo.id
        inner join man_doc_type mdt on mo.doc_type = mdt.doc_id
        where 1=1
@@ -139,7 +139,7 @@
            md.supp_code as suppCode,
            md.sku
        from
            man_order_detl md
            man_order_detl_pakin md
                inner join man_order mo on
                md.order_id = mo.id
        where
@@ -147,7 +147,7 @@
    </select>

    <update id="increase">
        update man_order_detl
        update man_order_detl_pakin
        set qty = qty + #{qty}
        where 1=1
        and order_id = #{orderId}
@@ -163,7 +163,7 @@
    </update>

    <update id="decrease">
        update man_order_detl
        update man_order_detl_pakin
        set work_qty = work_qty - #{qty}
        where 1=1
        and order_no = #{orderNo}
@@ -179,18 +179,18 @@
    </update>

    <update id="modifyStatus">
        update man_order_detl
        update man_order_detl_pakin
        set status = #{status}
        where 1=1
        and order_id = #{orderId}
    </update>

    <insert id="addToLogTable">
        INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
        INSERT INTO man_order_detl_pakin_log SELECT * FROM man_order_detl_pakin WHERE id = #{id}
    </insert>

    <update id="increaseQtyByOrderNo">
        update man_order_detl
        update man_order_detl_pakin
        set qty = qty + #{qty}
        where 1=1
        and order_no = #{orderNo}
@@ -206,7 +206,7 @@
    </update>

    <update id="increaseWorkQty">
        update man_order_detl
        update man_order_detl_pakin
        set work_qty = work_qty + #{workQty}
        where 1=1
        and order_id = #{orderId}
@@ -223,7 +223,7 @@


    <update id="increaseWorkQtyById">
        update man_order_detl
        update man_order_detl_pakin
        set work_qty = work_qty + #{workQty}
        where 1=1
          and id = #{id}

 src/main/resources/mapper/OrderDetlPakoutMapper.xml

copy from src/main/resources/mapper/OrderDetlMapper.xml
copy to src/main/resources/mapper/OrderDetlPakoutMapper.xml
File was copied from src/main/resources/mapper/OrderDetlMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.zy.asrs.mapper.OrderDetlMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetl">
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetlPakout">
        <id column="id" property="id" />
        <result column="order_id" property="orderId" />
        <result column="order_no" property="orderNo" />
@@ -53,7 +53,7 @@
    </resultMap>

    <select id="selectItem" resultMap="BaseResultMap">
        select top 1 * from man_order_detl
        select top 1 * from man_order_detl_pakout
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
@@ -68,7 +68,7 @@
    </select>

    <select id="selectItemByOrderNo" resultMap="BaseResultMap">
        select * from man_order_detl
        select * from man_order_detl_pakout
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}
@@ -78,7 +78,7 @@
    </select>

    <select id="selectWorkingDetls" resultMap="BaseResultMap">
        select * from man_order_detl
        select * from man_order_detl_pakout
        where 1=1
        and order_id = #{orderId}
        and qty &lt; anfme
@@ -105,7 +105,7 @@
            select
            ROW_NUMBER() over (order by mo.create_time desc) as row,
            mod.*
            from man_order_detl mod
            from man_order_detl_pakout mod
            inner join man_order mo on mod.order_id = mo.id
            inner join man_doc_type mdt on mo.doc_type = mdt.doc_id
            where 1=1
@@ -119,7 +119,7 @@
    <select id="getPakoutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
        select
        count(1)
        from man_order_detl mod
        from man_order_detl_pakout mod
        inner join man_order mo on mod.order_id = mo.id
        inner join man_doc_type mdt on mo.doc_type = mdt.doc_id
        where 1=1
@@ -139,7 +139,7 @@
            md.supp_code as suppCode,
            md.sku
        from
            man_order_detl md
            man_order_detl_pakout md
                inner join man_order mo on
                md.order_id = mo.id
        where
@@ -147,7 +147,7 @@
    </select>

    <update id="increase">
        update man_order_detl
        update man_order_detl_pakout
        set qty = qty + #{qty}
        where 1=1
        and order_id = #{orderId}
@@ -163,7 +163,7 @@
    </update>

    <update id="decrease">
        update man_order_detl
        update man_order_detl_pakout
        set work_qty = work_qty - #{qty}
        where 1=1
        and order_no = #{orderNo}
@@ -179,18 +179,18 @@
    </update>

    <update id="modifyStatus">
        update man_order_detl
        update man_order_detl_pakout
        set status = #{status}
        where 1=1
        and order_id = #{orderId}
    </update>

    <insert id="addToLogTable">
        INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
        INSERT INTO man_order_detl_pakout_log SELECT * FROM man_order_detl_pakout WHERE id = #{id}
    </insert>

    <update id="increaseQtyByOrderNo">
        update man_order_detl
        update man_order_detl_pakout
        set qty = qty + #{qty}
        where 1=1
        and order_no = #{orderNo}
@@ -206,7 +206,7 @@
    </update>

    <update id="increaseWorkQty">
        update man_order_detl
        update man_order_detl_pakout
        set work_qty = work_qty + #{workQty}
        where 1=1
        and order_id = #{orderId}
@@ -223,7 +223,7 @@


    <update id="increaseWorkQtyById">
        update man_order_detl
        update man_order_detl_pakout
        set work_qty = work_qty + #{workQty}
        where 1=1
          and id = #{id}

 src/main/resources/mapper/OrderPakinMapper.xml

copy from src/main/resources/mapper/OrderMapper.xml
copy to src/main/resources/mapper/OrderPakinMapper.xml
File was copied from src/main/resources/mapper/OrderMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.zy.asrs.mapper.OrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Order">
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderPakin">
        <id column="id" property="id" />
        <result column="uuid" property="uuid" />
        <result column="order_no" property="orderNo" />
@@ -44,7 +44,7 @@
    </resultMap>

    <update id="updateSettle">
        update man_order
        update man_order_pakin
        set settle = #{settle}
        ,update_time = getdate()
        <if test="userId != null">
@@ -56,7 +56,7 @@

    <select id="selectComplete" resultMap="BaseResultMap">
        select top 10 *
        from man_order
        from man_order_pakin
        where 1=1
        and settle = 4
        and status = 1
@@ -65,7 +65,7 @@

    <select id="selectComplete8" resultMap="BaseResultMap">
        select top 5 *
        from man_order
        from man_order_pakin
        where 1=1
        and settle = 8
        and status = 1
@@ -73,12 +73,12 @@
    </select>

    <insert id="addToLogTable">
        INSERT INTO man_order_log SELECT * FROM man_order WHERE id = #{id}
        INSERT INTO man_order_pakin_log SELECT * FROM man_order_pakin WHERE id = #{id}
    </insert>

    <select id="selectorderNoL" resultMap="BaseResultMap">
        select top 10 *
        from man_order
        from man_order_pakin
        where 1=1
        <if test="orderNo != null">
            and order_no = #{orderNo}
@@ -87,14 +87,14 @@

    <select id="selectOrderMoveStatus" resultMap="BaseResultMap">
        select top 1 *
        from man_order
        from man_order_pakin
        where 1=1
        and move_status = 2
    </select>

    <select id="selectOrderMoveStatusInitial" resultMap="BaseResultMap">
        select top 1 *
        from man_order
        from man_order_pakin
        where 1=1
        and move_status = 1
        order by update_time

 src/main/resources/mapper/OrderPakoutMapper.xml

File was renamed from src/main/resources/mapper/OrderMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.zy.asrs.mapper.OrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Order">
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderPakout">
        <id column="id" property="id" />
        <result column="uuid" property="uuid" />
        <result column="order_no" property="orderNo" />
@@ -44,7 +44,7 @@
    </resultMap>

    <update id="updateSettle">
        update man_order
        update man_order_pakout
        set settle = #{settle}
        ,update_time = getdate()
        <if test="userId != null">
@@ -56,7 +56,7 @@

    <select id="selectComplete" resultMap="BaseResultMap">
        select top 10 *
        from man_order
        from man_order_pakout
        where 1=1
        and settle = 4
        and status = 1
@@ -65,7 +65,7 @@

    <select id="selectComplete8" resultMap="BaseResultMap">
        select top 5 *
        from man_order
        from man_order_pakout
        where 1=1
        and settle = 8
        and status = 1
@@ -73,12 +73,12 @@
    </select>

    <insert id="addToLogTable">
        INSERT INTO man_order_log SELECT * FROM man_order WHERE id = #{id}
        INSERT INTO man_order_pakout_log SELECT * FROM man_order_pakout WHERE id = #{id}
    </insert>

    <select id="selectorderNoL" resultMap="BaseResultMap">
        select top 10 *
        from man_order
        from man_order_pakout
        where 1=1
        <if test="orderNo != null">
            and order_no = #{orderNo}
@@ -87,14 +87,14 @@

    <select id="selectOrderMoveStatus" resultMap="BaseResultMap">
        select top 1 *
        from man_order
        from man_order_pakout
        where 1=1
        and move_status = 2
    </select>

    <select id="selectOrderMoveStatusInitial" resultMap="BaseResultMap">
        select top 1 *
        from man_order
        from man_order_pakout
        where 1=1
        and move_status = 1
        order by update_time

 src/main/resources/mapper/PackMapper.xml

File was deleted

 src/main/resources/mapper/RequestLogMapper.xml

File was deleted

 src/main/resources/mapper/TaskDetlLogMapper.xml

New file
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.TaskDetlLogMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskDetlLog">
        <result column="wrk_no" property="wrkNo" />
        <result column="io_time" property="ioTime" />
        <result column="anfme" property="anfme" />
        <result column="zpallet" property="zpallet" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="batch" property="batch" />
        <result column="order_no" property="orderNo" />
        <result column="specs" property="specs" />
        <result column="model" property="model" />
        <result column="color" property="color" />
        <result column="brand" property="brand" />
        <result column="unit" property="unit" />
        <result column="price" property="price" />
        <result column="sku" property="sku" />
        <result column="units" property="units" />
        <result column="barcode" property="barcode" />
        <result column="origin" property="origin" />
        <result column="manu" property="manu" />
        <result column="manu_date" property="manuDate" />
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />
        <result column="supp_code" property="suppCode" />
        <result column="be_batch" property="beBatch" />
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />
        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="memo" property="memo" />
        <result column="line_number" property="lineNumber" />
        <result column="standby1" property="standby1" />
        <result column="standby2" property="standby2" />
        <result column="standby3" property="standby3" />
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />

    </resultMap>

</mapper>

 src/main/resources/mapper/TaskDetlMapper.xml

New file
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.TaskDetlMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskDetl">
        <result column="wrk_no" property="wrkNo" />
        <result column="io_time" property="ioTime" />
        <result column="anfme" property="anfme" />
        <result column="zpallet" property="zpallet" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="batch" property="batch" />
        <result column="order_no" property="orderNo" />
        <result column="specs" property="specs" />
        <result column="model" property="model" />
        <result column="color" property="color" />
        <result column="brand" property="brand" />
        <result column="unit" property="unit" />
        <result column="price" property="price" />
        <result column="sku" property="sku" />
        <result column="units" property="units" />
        <result column="barcode" property="barcode" />
        <result column="origin" property="origin" />
        <result column="manu" property="manu" />
        <result column="manu_date" property="manuDate" />
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />
        <result column="supp_code" property="suppCode" />
        <result column="be_batch" property="beBatch" />
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />
        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="memo" property="memo" />
        <result column="line_number" property="lineNumber" />
        <result column="standby1" property="standby1" />
        <result column="standby2" property="standby2" />
        <result column="standby3" property="standby3" />
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />

    </resultMap>

</mapper>

 src/main/resources/mapper/TaskLogMapper.xml

New file
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.TaskLogMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskLog">
        <result column="id" property="id" />
        <result column="wrk_no" property="wrkNo" />
        <result column="log_id" property="logId" />
        <result column="inv_wh" property="invWh" />
        <result column="ymd" property="ymd" />
        <result column="mk" property="mk" />
        <result column="whs_type" property="whsType" />
        <result column="wrk_sts" property="wrkSts" />
        <result column="io_type" property="ioType" />
        <result column="crn_no" property="crnNo" />
        <result column="sheet_no" property="sheetNo" />
        <result column="io_pri" property="ioPri" />
        <result column="wrk_date" property="wrkDate" />
        <result column="loc_no" property="locNo" />
        <result column="sta_no" property="staNo" />
        <result column="source_sta_no" property="sourceStaNo" />
        <result column="source_loc_no" property="sourceLocNo" />
        <result column="loc_sts" property="locSts" />
        <result column="picking" property="picking" />
        <result column="link_mis" property="linkMis" />
        <result column="online_yn" property="onlineYn" />
        <result column="upd_mk" property="updMk" />
        <result column="exit_mk" property="exitMk" />
        <result column="plt_type" property="pltType" />
        <result column="empty_mk" property="emptyMk" />
        <result column="io_time" property="ioTime" />
        <result column="ctn_type" property="ctnType" />
        <result column="packed" property="packed" />
        <result column="ove_mk" property="oveMk" />
        <result column="mtn_type" property="mtnType" />
        <result column="user_no" property="userNo" />
        <result column="crn_str_time" property="crnStrTime" />
        <result column="crn_end_time" property="crnEndTime" />
        <result column="plc_str_time" property="plcStrTime" />
        <result column="crn_pos_time" property="crnPosTime" />
        <result column="load_time" property="loadTime" />
        <result column="exp_time" property="expTime" />
        <result column="ref_wrkno" property="refWrkno" />
        <result column="ref_iotime" property="refIotime" />
        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="pause_mk" property="pauseMk" />
        <result column="error_time" property="errorTime" />
        <result column="error_memo" property="errorMemo" />
        <result column="ctn_kind" property="ctnKind" />
        <result column="manu_type" property="manuType" />
        <result column="memo_m" property="memoM" />
        <result column="sc_weight" property="scWeight" />
        <result column="log_mk" property="logMk" />
        <result column="log_err_time" property="logErrTime" />
        <result column="log_err_memo" property="logErrMemo" />
        <result column="barcode" property="barcode" />
        <result column="Pdc_type" property="PdcType" />
        <result column="ctn_no" property="ctnNo" />
        <result column="full_plt" property="fullPlt" />
        <result column="pre_have" property="preHave" />
        <result column="take_none" property="takeNone" />
        <result column="line_number" property="lineNumber" />

    </resultMap>

</mapper>

 src/main/resources/mapper/TaskMapper.xml

New file
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.TaskMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Task">
        <id column="id" property="id" />
        <result column="task_type" property="taskType" />

    </resultMap>

</mapper>

 src/main/webapp/static/js/order/orderPakin.js

 src/main/webapp/static/js/order/orderPakout.js

copy from src/main/webapp/static/js/order/order.js
copy to src/main/webapp/static/js/order/orderPakout.js

 src/main/webapp/static/js/orderReport/orderReport.js

copy from src/main/webapp/static/js/order/order.js
copy to src/main/webapp/static/js/orderReport/orderReport.js

 src/main/webapp/static/js/pack/pack.js

File was deleted

 src/main/webapp/views/order/orderPakin.html

copy from src/main/webapp/views/order/order.html
copy to src/main/webapp/views/order/orderPakin.html
File was copied from src/main/webapp/views/order/order.html
@@ -343,7 +343,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/orderPakin.js" charset="utf-8"></script>

<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>

 src/main/webapp/views/order/orderPakout.html

File was renamed from src/main/webapp/views/order/order.html
@@ -343,7 +343,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/orderPakout.js" charset="utf-8"></script>

<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>

 src/main/webapp/views/orderDetl/orderDetl.html

@@ -33,7 +33,7 @@
                    </div>
                </div>
            </div>
            <table class="layui-hide" id="orderDetl" lay-filter="orderDetl"></table>
            <table class="layui-hide" id="orderDetlPakout" lay-filter="orderDetlPakout"></table>
        </div>
    </div>
</div>
@@ -55,7 +55,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/orderDetl/orderDetl.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/orderDetlPakout/orderDetlPakout.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">

 src/main/webapp/views/orderReport/orderReport.html

copy from src/main/webapp/views/order/order.html
copy to src/main/webapp/views/orderReport/orderReport.html
File was copied from src/main/webapp/views/order/order.html
@@ -343,7 +343,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/orderPakin.js" charset="utf-8"></script>

<script type="text/template" id="docTypeTpl">
    <option value="">选择类型</option>

 src/main/webapp/views/pack/pack.html

File was deleted