src/main/java/com/zy/api/controller/KopenApiController.java

@@ -1,11 +1,12 @@
package com.zy.api.controller;

import com.alibaba.fastjson.JSON;

import com.core.common.R;
import com.zy.api.entity.OrderParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.service.KopenApiService;
import com.zy.asrs.entity.Mat;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -13,8 +14,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

@RestController
@@ -33,8 +32,8 @@
     * @return com.core.common.R
     */
    @ApiOperation("上架派工单")
    @PostMapping("/order/add")
    public R receiveOrders(@RequestBody OrderParams params) {
    @PostMapping("/sendInDispatch")
    public R receiveOrders(@RequestBody PubOrderParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
@@ -53,7 +52,7 @@
     * @return com.core.common.R
     */
    @ApiOperation("零件信息数据更新")
    @PostMapping("/sync/mat")
    @PostMapping("/sendPartsMaster")
    public R basMatUpdate(@RequestBody SyncMatParmas params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
@@ -66,5 +65,23 @@
    }


    /**
     * 上架派工单反馈
     * @author Ryan
     * @date 2025/11/24 15:20
     * @param params
     * @return com.core.common.R
     */
    @ApiOperation("上架派工单反馈")
    @PostMapping("/getInDispatchResult")
    public R getInDispatchResult(@RequestBody ReportOrderParam params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
            return R.error("取消条件不能为空！！");
        }
        return kopenApiService.getInDispatchResult(params);
    }

}

 src/main/java/com/zy/api/entity/OrderParams.java

@@ -35,8 +35,9 @@
    @ApiModelProperty("入库通知单号")
    private String inv_no;

    @ApiModelProperty("入库物料列表")
    List<OrderItemsParam> details;
    @ApiModelProperty("目标库区")
    private String target_location;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

 src/main/java/com/zy/api/entity/PubOrderParams.java

New file
@@ -0,0 +1,17 @@
package com.zy.api.entity;

import java.util.List;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

@Data
@Accessors(chain = true)
@ApiModel(value = "PubOrderParams", description = "发布订单信息")
public class PubOrderParams extends OrderParams{

    @ApiModelProperty("入库物料列表")
    List<OrderItemsParam> details;
}

 src/main/java/com/zy/api/entity/ReportOrderParam.java

New file
@@ -0,0 +1,18 @@
package com.zy.api.entity;

import java.util.List;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

@Data
@Accessors(chain = true)
@ApiModel(value = "ReportOrderParam", description = "上报订单信息")
public class ReportOrderParam extends OrderParams{

    @ApiModelProperty("上报订单列表")
    List<ReportOrderParams> details;

}

 src/main/java/com/zy/api/entity/ReportOrderParams.java

New file
@@ -0,0 +1,48 @@
package com.zy.api.entity;

import java.io.Serializable;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

@Data
@Accessors(chain = true)
@ApiModel("上报订单参数")
public class ReportOrderParams implements Serializable {

        @ApiModelProperty("BS Code")
        private String total_serial;

        @ApiModelProperty("产品类型")
        private String pro_type;

        @ApiModelProperty("零件代码")
        private String pro_komcode;

        @ApiModelProperty("供应商ID")
        private String pro_id;

        @ApiModelProperty("容器编码")
        private String location_no;

        @ApiModelProperty("货位类型")
        private String location_type;

        @ApiModelProperty("上架日期")
        private String sj_date;

        @ApiModelProperty("上架人")
        private String sj_emp;

        @ApiModelProperty("上架数量")
        private Integer pick_qty;

        @ApiModelProperty("破损数量")
        private Integer damage_qty;
        
        @ApiModelProperty("差异数量")
        private Integer diff_qty;

}

 src/main/java/com/zy/api/service/KopenApiService.java

@@ -1,7 +1,8 @@
package com.zy.api.service;

import com.core.common.R;
import com.zy.api.entity.OrderParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;

public interface KopenApiService {
@@ -14,7 +15,7 @@
     * @param params
     * @return com.core.common.R
     */
    R receiveOrders(OrderParams params);
    R receiveOrders(PubOrderParams params);

    /**
     * 基础零件变更
@@ -31,5 +32,12 @@
     * @author Ryan
     * @date 2025/11/24 15:33
     */
    void addOrUpdateOrders(OrderParams params, String type) ;
    void addOrUpdateOrders(PubOrderParams params, String type) ;

    /**
     * 上架派工单反馈
     * @param params
     * @return
     */
    R getInDispatchResult(ReportOrderParam params);
}

 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java

@@ -6,6 +6,9 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.entity.OrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.enums.MatLocType;
import com.zy.api.enums.MatType;
@@ -22,6 +25,7 @@
import com.zy.asrs.service.OrderService;

import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -52,12 +56,47 @@
     * @return com.core.common.R
     */
    @Override
    public R receiveOrders(OrderParams params) {
    public R receiveOrders(PubOrderParams params) {
        if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) {
            return R.error("当前类型不是上架派工单！！");
        }
        addOrUpdateOrders(params, "add");
        return R.ok("单据下发成功！！");
    }

    /**
     * 上架派工单反馈
     * @author Ryan
     * @date 2025/11/24 15:33
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R getInDispatchResult(ReportOrderParam params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        String response = null;
        try {
            response = new HttpHandler.Builder()
                    .setUri("127.0.0.1:8081")
                    .setPath("/wms/order/getInDispatchResult")
                    .setJson(JSONObject.toJSONString(params))
                    .build()
                    .doPost();
            if (Objects.isNull(response) || response.trim().isEmpty()) {
                return R.error("外网接口无响应！！");
            }
            JSONObject jsonObject = JSONObject.parseObject(response);
            Integer code = jsonObject.getInteger("code");
            if (!Objects.isNull(code) && code.equals(1)) {
                return R.ok("入库单上报完成！！");
            } else {
                String msg = jsonObject.getString("message");
                return R.error(Objects.isNull(msg) ? "上报失败！！" : msg);
            }
        } catch (Exception e) {
            return R.error(e.getMessage());
        }
    }

    /**
@@ -121,7 +160,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addOrUpdateOrders(OrderParams params, String type) {
    public void addOrUpdateOrders(PubOrderParams params, String type) {
        if (Objects.isNull(params)) {
            throw new CoolException("参数不能为空！！");
        }
@@ -161,7 +200,7 @@
     * @param params
     */
    @Transactional(rollbackFor = Exception.class)
    public void generateOrders(OrderParams params) {
    public void generateOrders(PubOrderParams params) {
        // 将数据当新订单插入
        Order newOrder = new Order();
        if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {

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

@@ -256,6 +256,12 @@
        LocMast locMast = service.selectById(this.locNo);
        if (!Cools.isEmpty(locMast)){
            return String.valueOf(locMast.getLocNo());
        }else {
            LocCacheService service2 = SpringUtils.getBean(LocCacheService.class);
            LocCache locCache = service2.selectOne(new EntityWrapper<LocCache>().eq("loc_no", this.locNo));
            if (!Cools.isEmpty(locCache)){
                return String.valueOf(locCache.getLocNo());
            }
        }
        return null;
    }

 src/main/java/com/zy/asrs/entity/result/CrnTaskDetlDTO.java

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

import com.zy.asrs.entity.LocDetl;
import lombok.Data;
import lombok.experimental.Accessors;


import java.util.List;

@Data
@Accessors(chain = true)
public class CrnTaskDetlDTO {

    private String locNo;

    private List<LocDetl> locDetlList;

}

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

@@ -8,10 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.entity.result.ForwardAGVTaskDTO;
import com.zy.asrs.entity.result.HIKApiDTO;
import com.zy.asrs.entity.result.HIKResultDTO;
import com.zy.asrs.entity.result.*;
import com.zy.asrs.enums.*;
import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.enums.LocStsType;
@@ -2118,7 +2115,7 @@
        }
        Collections.shuffle(devps);
        BasDevp basDevp = devps.stream().findFirst().get();
        List<LocMast> locMasts = new ArrayList<>();
        List<CrnTaskDetlDTO> locMasts = new ArrayList<>();
        Map<String, List<LocDetl>> listMap = locDetls.stream().collect(Collectors.groupingBy(LocDetl::getMatnr));
        //获取查库存总数量
        AtomicReference<Double> totalOut = new AtomicReference<>(0.0);
@@ -2162,7 +2159,8 @@
                            if (sum.compareTo(v) <= 0 && sum.compareTo(itemed.get()) > 0) {
                                itemed.set(Math.round((itemed.get() + v) * 10000) / 10000.0);
                                // 可放下
                                locMasts.add(locMast);
                                CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(adetls);
                                locMasts.add(crnTaskDetlDTO);
                                totalOut.set(Math.round((totalOut.get() + itemed.get()) * 10000) / 10000.0);
                            }
                        }
@@ -2181,9 +2179,10 @@
                    .eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)
                    .orderAsc(Arrays.asList("row1", "bay1", "lev1"))
                    .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
            locMasts.add(locMast);
            CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(locDetls);
            locMasts.add(crnTaskDetlDTO);
            // 空板出库
            generateTask(locMasts, TaskIOType.EMPTY_OUT.type, basDevp, userId);
            generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId);
        }
    }

@@ -2195,47 +2194,51 @@
     * @date 2025/12/6 14:44
     */
    @Transactional(rollbackFor = Exception.class)
    public void generateTask(List<LocMast> locMasts, Integer ioType, BasDevp devp, Long userId) {
    public void generateTask(List<CrnTaskDetlDTO> locMasts, Integer ioType, BasDevp devp, Long userId) {
        Date now = new Date();
        for (LocMast locMast : locMasts) {

        for (CrnTaskDetlDTO crnTaskDetlDTO : locMasts) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", crnTaskDetlDTO.getLocNo()));
            if (Objects.isNull(ioType)) {
                continue;
            }
            Integer outSta = devp.getDevNo();
            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locMast.getLocNo()));
            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(ioType); // 入出库类型
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 源站
            wrkMast.setStaNo(staDesc.getStnNo() + ""); // 目标站
            wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());
            wrkMast.setAppeUser(userId); // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号：" + locMast.getLocNo());
            if (Cools.isEmpty(wrkMast1)){
                Integer outSta = devp.getDevNo();
                // 获取路径
                StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);

                // 生成工作档
                WrkMast wrkMast = new WrkMast();
                wrkMast.setWrkNo(workNo);
                wrkMast.setIoTime(now);
                wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
                wrkMast.setIoType(ioType); // 入出库类型
                wrkMast.setIoPri(13D); // 优先级：13
                wrkMast.setCrnNo(locMast.getCrnNo());
                wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 源站
                wrkMast.setStaNo(staDesc.getStnNo() + ""); // 目标站
                wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
                wrkMast.setFullPlt("Y"); // 满板：Y
                wrkMast.setPicking("N"); // 拣料
                wrkMast.setExitMk("N"); // 退出
                wrkMast.setEmptyMk("N"); // 空板
                wrkMast.setLinkMis("N");
                wrkMast.setBarcode(locMast.getBarcode());
                wrkMast.setAppeUser(userId); // 操作人员数据
                wrkMast.setAppeTime(now);
                wrkMast.setModiUser(userId);
                wrkMast.setModiTime(now);
                if (!wrkMastService.insert(wrkMast)) {
                    throw new CoolException("保存工作档失败，出库库位号：" + locMast.getLocNo());
                }
            }else {
                workNo = wrkMast1.getWrkNo();
            }

            List<LocDetl> locDetls = locDetlService
                    .selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));

            // 生成工作档明细
            for (LocDetl detlDto : locDetls) {
            for (LocDetl detlDto : crnTaskDetlDTO.getLocDetlList()) {
                WrkDetl wrkDetl = new WrkDetl();
                BeanUtils.copyProperties(detlDto, wrkDetl);
                wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号

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

@@ -245,6 +245,9 @@
        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
            List<TaskDetl> wrkDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", wrkMast.getWrkNo()));
            for (TaskDetl wrkDetl : wrkDetls) {
                if (Cools.isEmpty(wrkDetl.getOrderNo())){
                    continue;
                }
                if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                    OrderInAndOutUtil.decrease(Boolean.FALSE, wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
                            wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
@@ -254,7 +257,7 @@
                    boolean flag = true;
                    OrderPakin order =  orderService.selectByNo(wrkDetl.getOrderNo());  //OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
                    if (Objects.isNull(order)) {
                        throw new CoolException("单据信息不存在！！");
                        continue;
                    }
                    List<OrderDetlPakin> orderDetls = orderDetlService.selectByOrderId(order.getId()); //OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
                    for (OrderDetlPakin orderDetl : orderDetls) {

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

@@ -5,6 +5,8 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.service.KopenApiService;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
@@ -47,6 +49,8 @@
    private OrderPakinService  orderPakinService;
    @Autowired
    private OrderDetlPakinService orderDetlPakinService;
    @Autowired
    private KopenApiService kopenApiService;

    @Transactional
    public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -208,6 +212,16 @@
        OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
        return SUCCESS;
    }



    /**
     * 单据上报
     * @author Ryan
     * @date 2025/12/15 16:14
     * @param order
     * @return com.zy.asrs.task.core.ReturnT<java.lang.String>
     */
    @Transactional
    public ReturnT<String> startOrderReport(Order order) {
        DocType docType = docTypeService.selectById(order.getDocType());
@@ -233,6 +247,9 @@
            String response = "";
            boolean success = false;
            try {
                ReportOrderParam orderParam = new ReportOrderParam();

                kopenApiService.getInDispatchResult(orderParam);
//                response = new HttpHandler.Builder()
//                        .setUri(MesConstant.URL)
//                        .setPath(MesConstant.PAKIN_URL)

 src/main/resources/mapper/LocDetlMapper.xml

@@ -531,14 +531,6 @@
        where 1=1
        and b.loc_sts = 'F'
        and a.matnr = #{matnr}
        <!--        <choose>-->
        <!--            <when test="batch != null and batch != ''">-->
        <!--                and a.batch = #{batch}-->
        <!--            </when>-->
        <!--            <otherwise>-->
        <!--                and (a.batch IS NULL OR a.batch = '')-->
        <!--            </otherwise>-->
        <!--        </choose>-->
        <if test="orderNo != null and orderNo != ''">
            and a.order_no = #{orderNo}
        </if>
@@ -625,14 +617,6 @@
        where 1=1
        and b.loc_sts = 'F'
        and a.matnr = #{matnr}
        <!--        <choose>-->
        <!--            <when test="batch != null and batch != ''">-->
        <!--                and a.batch = #{batch}-->
        <!--            </when>-->
        <!--            <otherwise>-->
        <!--                and (a.batch IS NULL OR a.batch = '')-->
        <!--            </otherwise>-->
        <!--        </choose>-->
        <if test="orderNo != null and orderNo != ''">
            and a.order_no = #{orderNo}
        </if>

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -7,7 +7,8 @@
        ,{field: 'matnr', align: 'center',title: '商品编号', sort:true}
        ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
        ,{field: 'orderNo', align: 'center',title: '单据编号', hide: true}
        ,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true}
        ,{field: 'threeCode', align: 'center',title: 'BS Code', sort:true}
        ,{field: 'standby1', align: 'center',title: '供应商代码', sort:true}
        ,{field: 'anfme', align: 'center',title: '可用数量'}
        ,{field: 'diffQty', align: 'center',title: '差异数量',
            templet: function(d) {

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -129,6 +129,9 @@
    {{#if (d.ioType === 107) { }}
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">盘</a>
    {{# } }}
    {{#if (d.ioType === 104) { }}
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">并</a>
    {{# } }}
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>