#

lty

3 天以前 00e89a8c713516855b51fe408debcca0fa44c424

#

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

@@ -176,8 +176,17 @@
                    continue;
                }
                List<LocDetl> locDetls = null;
                locDetls = locDetlService.queryStockAll123(null, exist,orderDetl.getMatnr(), orderDetl.getBoxType3());

                String cleanOrder = (orderDetl.getBoxType3() != null
                        ? orderDetl.getBoxType3().trim()
                        : "") + "-HDU";
                locDetls = locDetlService.queryStockAll123(null, exist,
                        orderDetl.getMatnr(), cleanOrder);
                if(locDetls.size() < 1){
                    locDetls = locDetlService.queryStockAll123(null, exist,
                            orderDetl.getMatnr(), orderDetl.getBoxType3());
                }
//                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
//                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2());
                for (LocDetl locDetl : locDetls) {
                    if (issued > 0) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),

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

@@ -1,9 +1,12 @@
package com.zy.asrs.entity;

import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.ToStringSerializer;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.zy.asrs.entity.param.TaskArmReportParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java

@@ -4,16 +4,16 @@
    BD_MATERIAL(0, "物料档案","BD_MATERIAL","","","",1),
    BD_RRGANIZATION(2, "供应商","BD_RRGANIZATION","","","",1),
    PUR_RECEIVEBIll(3, "收料单","PUR_RECEIVEBIll","","","",1),
    SAL_OUTSTOCK(7, "销售出库单","SAL_OUTSTOCK","FRealQty","","",0),
//    SAL_OUTSTOCK(7, "销售出库单","SAL_OUTSTOCK","FRealQty","","",0),
//    STK_MisDelivery(19, "其他出库单","STK_MisDelivery","FQty","","",0),
//    STK_MISCELLANEOUS(18, "其他入库单","STK_MISCELLANEOUS","FQty","其他入库单","STK_MISCELLANEOUS",1),

    SAL_RETURNSTOCK(9, "销售退货单","SAL_RETURNSTOCK","","","",1),
    PRD_PickMtrl(10, "生产领料单","PRD_PickMtrl","","","",0),
    PRD_ReturnMtrl(12, "生产退料单","PRD_ReturnMtrl","","","",1),
    PRD_FeedMtrl(14, "生产补料单","PRD_FeedMtrl","","","",0),
    PRD_MORPT(16, "生产汇报单","PRD_MORPT","","生产入库单","",1),
    OUI_RECEIVEBIll(24, "委外入库单","OUI_RECEIVEBIll","","","",1),
//    SAL_RETURNSTOCK(9, "销售退货单","SAL_RETURNSTOCK","","","",1),
//    PRD_PickMtrl(10, "生产领料单","PRD_PickMtrl","","","",0),
//    PRD_ReturnMtrl(12, "生产退料单","PRD_ReturnMtrl","","","",1),
//    PRD_FeedMtrl(14, "生产补料单","PRD_FeedMtrl","","","",0),
//    PRD_MORPT(16, "生产汇报单","PRD_MORPT","","生产入库单","",1),
//    OUI_RECEIVEBIll(24, "委外入库单","OUI_RECEIVEBIll","","","",1),

    //    PUR_MRB(2, "采购退料单","PUR_MRB","FRMREALQTY","","",1),
//    STK_TransferDirect(6, "直接调拨单","STK_TransferDirect","","FQty","",1),

 src/main/webapp/static/js/basArmMast/basArmMast.js

@@ -51,6 +51,7 @@
            pageSize: 'limit'
        },
        parseData: function (res) {
            console.log(res);
            return {
                'code': res.code,
                'msg': res.msg,