#pda料箱组托和换码

lty

3 天以前 d907a822a940c7ec0fb7de0ca845472bda52229b

#pda料箱组托和换码

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

@@ -9,10 +9,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -156,6 +153,19 @@
        return R.ok("response.comb_success");
    }

    @RequestMapping("/cartonComb/auth")
    @ManagerAuth(memo = "response.pallet_comb")
    public R cartonComb(@RequestBody List<CombCartonParam> params ){
        mobileService.cartonComb(params, getUserId());
        return R.ok("response.comb_success");
    }

    @RequestMapping("/cartonScan/auth")
    @ManagerAuth(memo = "response.carton_scan")
    public R cartonScan(@RequestBody ScanParam scanParam){
        OrderDetl orderDetl = mobileService.cartonScan(scanParam, getUserId());
        return R.ok("response.scan_success").add(orderDetl);
    }
    @RequestMapping("/pack/get/auth")
    @ManagerAuth(memo = "response.mobile_pack_get")
    public R packGet(@RequestParam String barcode){

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

@@ -158,7 +158,7 @@
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBarcode());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("response.save_order_detail_failed");
@@ -211,7 +211,7 @@
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBarcode());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("response.save_order_detail_failed");

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

@@ -24,15 +24,15 @@

    private static final long serialVersionUID = 1L;

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

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

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

    @ApiModelProperty(value= "商品编号")
@@ -43,12 +43,12 @@
    @ExcelProperty("商品名称")
    private String maktx;

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

    @ApiModelProperty(value= "批号")
    @ExcelProperty("批号")
    @ApiModelProperty(value= "批号")  //carton number  ctn
    @ExcelProperty("carton number")
    private String batch;

    @ApiModelProperty(value= "单据编号")
@@ -56,10 +56,10 @@
    @TableField("order_no")
    private String orderNo;

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

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

    @ApiModelProperty(value= "品牌")
@@ -71,26 +71,26 @@
    @ApiModelProperty(value= "单价")
    private Double price;

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

    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "单据数量")  //order qty
    private Double units;

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

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

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

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

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

@@ -104,17 +104,17 @@
    @ApiModelProperty(value= "长度")
    private Double length;

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

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

    @ApiModelProperty(value= "供应商")
    @ApiModelProperty(value= "销售单号")  //SO/OC  sales order
    private String supp;

    @ApiModelProperty(value= "供应商编码")
    @ApiModelProperty(value= "采购单号")//POrder
    @TableField("supp_code")
    private String suppCode;

@@ -130,13 +130,13 @@
    @TableField("dead_warn")
    private Integer deadWarn;

    @ApiModelProperty(value= "制购 1: 制造  2: 采购  3: 外协  ")
    @ApiModelProperty(value= "包装类型solid/ratio ")  //Pack type
    private Integer source;

    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    @ApiModelProperty(value= "检验状态 1: success  0: fail  ")  //inspection status
    private Integer inspect;

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

    @ApiModelProperty(value= "修改人员")
@@ -155,10 +155,10 @@
    @TableField("appe_time")
    private Date appeTime;

    @ApiModelProperty(value= "备注")
    @ApiModelProperty(value= "卖家条码")  //Buyer label barcode
    private String memo;

    @ApiModelProperty(value= "组合键")
    @ApiModelProperty(value= "组合id")  //cartonId-POnumber-item Number
    private String mixNumber;

    public String getLocNo$(){

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

@@ -152,6 +152,9 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "区域id")
    private Integer areaId;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){

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

@@ -151,6 +151,8 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "区域id")
    private Integer areaId;
    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){

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

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

import lombok.Data;

import java.util.List;

@Data
public class CombCartonParam {

    // 单据编号
    private String orderNo;

    // 托盘条码
    private String barcode;

    private Integer zoneId;

    private String zoneName;
    // 库位编号
    private String locno;

    private List<CombCartonParam.Cartons> cartons;

    @Data
    public static class Cartons {

        // 物料编号
        private String matnr;

        // 序列码
        private String batch;

        // 物料数量
        private Double anfme;

        // 商品名称
        private String maktx;

        // 规格
        private String specs;

        //箱子条码
        private String cartonLabel;

    }
}

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

@@ -40,6 +40,9 @@
        // 规格
        private String specs;

        //箱子条码
        private String cartonLabel;

    }

}

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

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

import lombok.Data;

@Data
public class ScanParam {
    private String cartonLabel;
}

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

@@ -31,6 +31,8 @@
        // 数量
        private Double count;

        private String barcode;

    }

}

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

@@ -14,4 +14,7 @@
    private String grade = "";

    private String brand = "";
    private String cartonLabel = "";
    private String orderNo = "";
    private Integer areaId;
}

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

@@ -22,12 +22,17 @@
    Integer listByPageCount(Map<String, Object> map);

    LocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
    LocDetl selectItemCarton(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,@Param("barcode")String barcode);

    List<LocDetl> selectItemByLocNo(String locNo);

    int deleteItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);

    int updateAnfme(@Param("anfme")Double anfme, @Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
    int deleteItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,@Param("barcode")String barcode);

    int updateAnfme(@Param("anfme")Double anfme, @Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,@Param("barcode")String barcode);


    List<LocDetl> getStockOutPage(Map<String, Object> map);

@@ -81,4 +86,7 @@
    List<LocDetl> selectLocDetlUnilateralMoveShuttleN(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);

    List<String> getSameDetlList(String matnr);

    List<String> getSameDetlList2(String orderNo,Integer areaId);

}

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

@@ -14,6 +14,7 @@
public interface OrderDetlMapper extends BaseMapper<OrderDetl> {

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

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

@@ -32,6 +33,9 @@
    int addToLogTable(OrderDetl orderDetl);

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

    int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty,@Param("barcode")String barcode);

    int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
}

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

@@ -20,6 +20,9 @@
    int deleteItem(@Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);

    int updateAnfme(@Param("anfme")Double anfme, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
    int deleteItem(@Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch,@Param("barcode")String barcode);

    int updateAnfme(@Param("anfme")Double anfme, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch,@Param("barcode")String barcode);

    List<WrkDetl> selectAndLogByOrderNo(String orderNo);


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

@@ -14,6 +14,7 @@
    Page<LocDetl> getPage(Page<LocDetl> page);

    LocDetl selectItem(String locNo, String matnr, String batch);
    LocDetl selectItemCarton(String locNo, String matnr, String batch,String barcode);

    List<LocDetl> selectItemByLocNo(String locNo);

@@ -23,6 +24,7 @@
     * 修改库存明细数量，如果数量为0，则删除记录
     */
    boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);
    boolean updateAnfme(Double anfme, String locNo, String matnr, String batch,String barcode);

    boolean updateLocNo(String newLocNo, String oldLocNo);

@@ -73,4 +75,7 @@
    List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo);

    List<String> getSameDetlList(String matnr);

    List<String> getSameDetlList2(String orderNo,Integer areaId);

}

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

@@ -4,11 +4,10 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.*;

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

public interface MobileService {

@@ -18,6 +17,15 @@
    void comb(CombParam param, Long userId);

    /**
     * 组托
     */
    void cartonComb(List<CombCartonParam> params, Long userId);
    /**
     * 扫箱条码
     */
    OrderDetl cartonScan(ScanParam scanParam, Long userId);

    /**
     * 上架
     */
    void onSale(CombParam param);

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

@@ -13,6 +13,7 @@
    Page<OrderDetl> getPakoutPage(Page<OrderDetl> page);

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

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

@@ -27,6 +28,7 @@
    boolean addToLogTable(OrderDetl orderDetl);

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

    /**
     * 入出库任务生成时，更新单据表中作业数量
@@ -37,4 +39,6 @@
     * @return
     */
    boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
    boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty,String cartonLabel);

}

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

@@ -17,6 +17,8 @@
    WrkDetl selectSingleByWrkNo(Integer workNo);

    boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch);
    boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch,String barcode);


    List<WrkDetl> selectAndLogByOrderNo(String orderNo);
    List<WrkDetl> findByBarcode(String barcode);

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

@@ -38,7 +38,14 @@
            return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
        }
    }

    @Override
    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch,String barcode) {
        if (anfme <= 0) {
            return this.baseMapper.deleteItem(locNo, matnr, batch,barcode) > 0;
        } else {
            return baseMapper.updateAnfme(anfme, locNo, matnr, batch,barcode) > 0;
        }
    }

    @Override
    public boolean updateLocNo(String newLocNo, String oldLocNo) {
@@ -119,6 +126,11 @@
        return this.baseMapper.selectItem(locNo, matnr, batch);
    }

    @Override
    public LocDetl selectItemCarton(String locNo, String matnr, String batch,String barcode) {
        return this.baseMapper.selectItemCarton(locNo, matnr, batch,barcode);
    }

    public List<LocDetl> selectItemByLocNo(String locNo) {
        return this.baseMapper.selectItemByLocNo(locNo);
    }
@@ -153,4 +165,9 @@
    public List<String> getSameDetlList(String matnr) {
        return this.baseMapper.getSameDetlList(matnr);
    }

    @Override
    public List<String> getSameDetlList2(String orderNo,Integer areaId) {
        return this.baseMapper.getSameDetlList2(orderNo,areaId);
    }
}

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

@@ -7,10 +7,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
@@ -202,6 +199,108 @@

    }

    @Override
    @Transactional
    public void cartonComb(List<CombCartonParam> params, Long userId) {
        for (CombCartonParam param : params) {
            if (Cools.isEmpty(param.getBarcode(), param.getCartons())) {
                throw new CoolException(BaseRes.PARAM);
            }
            // 判断是否有相同条码的数据
            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                    eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
                throw new CoolException("response.data_processing_inbound");
            }

            if(param.getBarcode().length()!=8){
                throw new CoolException("response.barcode_length_invalid");
            }
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
            int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
            if (countLoc > 0 || countWrk > 0 || countwait > 0) {
                throw new CoolException("response.pallet_data_exists");
            }

            Date now = new Date();

            Order order = orderService.selectByNo(param.getOrderNo());
            if (Cools.isEmpty(order) || order.getSettle() > 2) {
                throw new CoolException("response.order_expired");
            }
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCartons().forEach(elem -> {

                // 订单明细数量校验
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),elem.getCartonLabel());
                if (elem.getAnfme() > orderDetl.getEnableQty()) {
                    throw new CoolException("response.inbound_qty_invalid");
                }
                // 修改订单作业数量
                if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCartonLabel())) {
                    throw new CoolException("response.update_doc_qty_failed");
                }

                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCartonLabel());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getCartonLabel());
                    assert one != null;
                    one.setAreaId(param.getZoneId());
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                } else {
                    detlDtos.add(detlDto);
                }
            });
            for (DetlDto detlDto : detlDtos) {
                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException("response.material_not_exist");
                }
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                        .eq("order_no",order.getOrderNo())
                        .eq("matnr",mat.getMatnr())
                        .eq("barcode",detlDto.getCartonLabel()));
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.sync(orderDetl);
                waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
                waitPakin.setBatch(detlDto.getBatch());     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setAreaId(param.getZoneId()); //区域
                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("response.save_wait_pakin_failed");
                }
            }
            orderService.updateSettle(order.getId(), 2L, userId);
        }

    }

    @Override
    public OrderDetl cartonScan(ScanParam scanParam , Long userId) {
        String cartonLabel = scanParam.getCartonLabel();
        if(cartonLabel == null){
            throw new CoolException("Label can not be null");
        }
        List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("barcode",cartonLabel));
        if(waitPakins.size() > 0){
            throw new CoolException("Label has already been in system");
        }
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("barcode",cartonLabel));
        if(orderDetl == null){
            throw new CoolException("OrderDetl can not be found");
        }
        return orderDetl;
    }

    // 商品上架
    @Override
    public void onSale(CombParam param) {

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

@@ -32,6 +32,11 @@
    }

    @Override
    public OrderDetl selectItem(Long orderId, String matnr, String batch,String cartonLabel) {
        return this.baseMapper.selectItem(orderId, matnr, batch,cartonLabel);
    }

    @Override
    public OrderDetl selectItem(String orderNo, String matnr, String batch) {
        return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
    }
@@ -78,6 +83,11 @@
        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
    }

    @Override
    public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty,String barcode) {
        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty,barcode) > 0;
    }

    /**
     * 入出库任务生成时，更新单据表中作业数量
     * @param orderId
@@ -90,4 +100,9 @@
    public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
        return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
    }

    @Override
    public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty,String cartonLabel) {
        return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty,cartonLabel) > 0;
    }
}

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

@@ -180,8 +180,8 @@
        // 获取库位明细
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount(),paramLocDetl.getBarcode())) {
                LocDetl one = locDetlService.selectItemCarton(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getBarcode());
                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
            }
        }
@@ -499,7 +499,6 @@
                    }
                    WrkDetl wrkDetl = new WrkDetl();
                    wrkDetl.sync(detlDto.getLocDetl());
                    wrkDetl.setOrderNo("");
                    wrkDetl.setWrkNo(workNo);
                    wrkDetl.setIoTime(now);
                    Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
@@ -635,9 +634,10 @@
        // 生成工作档明细
        for (LocDto locDto : taskDto.getLocDtos()) {
            if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
            Order order = orderService.selectByNo(locDto.getOrderNo());
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), locDto.getBatch(),locDto.getBarcode());
            if (orderDetl == null) {
                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
                orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), null,locDto.getBarcode());
            }
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(orderDetl);
@@ -655,7 +655,7 @@
                throw new CoolException("response.save_work_detail_failed");
            }
            // 修改订单明细
            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(),locDto.getBarcode())) {
                throw new CoolException("response.update_order_detail_qty_failed");
            }
            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
@@ -1198,8 +1198,8 @@
        // 获取库位明细
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount(),paramLocDetl.getBarcode())) {
                LocDetl one = locDetlService.selectItemCarton(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getBarcode());
                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
            }
        }
@@ -1360,7 +1360,7 @@
                    if (!locDetl.getAnfme().equals(adjust.getCount())) {
                        // todo 盘点记录
                        // 修改库存
                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {
                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBarcode())) {
                            throw new CoolException("response.update_stock_qty_failed|" + locDetl.getLocNo() + "," + locDetl.getMatnr() + "," + locDetl.getBatch());
                        }
                        // 保存调整记录
@@ -1385,7 +1385,7 @@
        // 删除库存
        for (LocDetl locDetl : locDetls) {
            // todo 盘点记录
            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {
            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBarcode())) {
                throw new CoolException("response.delete_stock_detail_failed|" + locDetl.getLocNo() + "," + locDetl.getMatnr() + "," + locDetl.getBatch());
            }
            // 保存调整记录

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

@@ -71,6 +71,15 @@
    }

    @Override
    public boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch,String barcode) {
        if (anfme <= 0) {
            return this.baseMapper.deleteItem(wrkNo, matnr, batch,barcode) > 0;
        } else {
            return baseMapper.updateAnfme(anfme, wrkNo, matnr, batch,barcode) > 0;
        }
    }

    @Override
    public List<WrkDetl> selectAndLogByOrderNo(String orderNo) {
        return this.baseMapper.selectAndLogByOrderNo(orderNo);
    }

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

@@ -4,6 +4,7 @@
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
@@ -37,6 +38,8 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private OrderServiceImpl orderService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -96,9 +99,9 @@
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        LocDetl locDetl = locDetlService.selectItemCarton(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode())) {
//                                exceptionHandle("全板入库 ===>> 更新库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("全板入库 ===>> 更新库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -119,14 +122,15 @@
                        }

                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetl==null){
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                        Order order = orderService.selectByNo(wrkDetl.getOrderNo());
                        OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode());
                        if(null == orderDetl) {
                            return FAIL.setMsg("未找到对应入库单据");
                        }
                        try {
                            if(!Cools.isEmpty(orderDetl)){
                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(),wrkDetl.getAnfme())){
                                        orderDetl.getBatch(),wrkDetl.getAnfme(),wrkDetl.getBarcode())){
//                                    exceptionHandle("全板入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -164,9 +168,9 @@
                        return FAIL.setMsg("拣料入库 ===>> 工作明细档为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
                    for (WrkDetl wrkDetl : wrkDetls53) {
                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        LocDetl locDetl = locDetlService.selectItemCarton(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode())) {
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("拣料入库 ===>> 更新库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                            }
@@ -185,14 +189,16 @@
                        }

                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        Order order = orderService.selectByNo(wrkDetl.getOrderNo());

                        OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode());
                        if (orderDetl==null){
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                            orderDetl = orderDetlService.selectItem(order.getId(), wrkDetl.getMatnr(), null,wrkDetl.getBarcode());
                        }
                        try {
                            if(!Cools.isEmpty(orderDetl)){
                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(),wrkDetl.getAnfme())){
                                        orderDetl.getBatch(),wrkDetl.getAnfme(),wrkDetl.getBarcode())){
//                                    exceptionHandle("全板入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -218,7 +224,7 @@
                        try {
                            if(!Cools.isEmpty(orderDetl)){
                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(),wrkDetl.getAnfme())){
                                        orderDetl.getBatch(),wrkDetl.getAnfme(),wrkDetl.getBarcode())){
//                                    exceptionHandle("拣料入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -303,9 +309,9 @@
                        return FAIL.setMsg("盘点入库 ===>> 工作明细档为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
                    for (WrkDetl wrkDetl : wrkDetls57) {
                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        LocDetl locDetl = locDetlService.selectItemCarton(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode())) {
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("盘点入库 ===>> 更新库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                            }
@@ -439,14 +445,15 @@
                    }
                    for (WrkDetl wrkDetl : wrkDetls101) {
                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        Order order = orderService.selectByNo(wrkDetl.getOrderNo());
                        OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode());
                        if (orderDetl==null){
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                            orderDetl = orderDetlService.selectItem(order.getId(), wrkDetl.getMatnr(), null,wrkDetl.getBarcode());
                        }
                        try {
                            if(!Cools.isEmpty(orderDetl)){
                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(),wrkDetl.getAnfme())){
                                        orderDetl.getBatch(),wrkDetl.getAnfme(),wrkDetl.getBarcode())){
//                                    exceptionHandle("全板出库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

 src/main/java/com/zy/common/model/DetlDto.java

@@ -20,6 +20,9 @@
    private String batch;

    private Double anfme;
    private Integer areaId;

    private String cartonLabel;

    public DetlDto() {
    }
@@ -38,6 +41,13 @@
        this.matnr = matnr;
        this.batch = batch;
        this.anfme = anfme;
    }

    public DetlDto(String matnr, String batch, Double anfme,String cartonLabel) {
        this.matnr = matnr;
        this.batch = batch;
        this.anfme = anfme;
        this.cartonLabel = cartonLabel;
    }

    public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
@@ -66,7 +76,7 @@

    public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
        for (DetlDto dto : detlDtos) {
            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && Cools.eq(dto.getCartonLabel(), detlDto.getCartonLabel()) ) {
                return true;
            }
        }
@@ -85,4 +95,16 @@
        return null;
    }

    public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String cartonLabel) {
        if (Cools.isEmpty(matnr)) {
            return null;
        }
        for (DetlDto detlDto : detlDtos) {
            if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch()) && Cools.eq(cartonLabel, detlDto.getCartonLabel())) {
                return detlDto;
            }
        }
        return null;
    }

}

 src/main/java/com/zy/common/model/LocDto.java

@@ -29,6 +29,8 @@

    private Integer staNo;

    private String barcode;

    public LocDto() {
    }

@@ -55,6 +57,35 @@
        this.orderNo = orderNo;
        this.anfme = anfme;
    }
    public LocDto(String locNo, String matnr, String batch, Double anfme,String barcode) {
        this.locNo = locNo;
        this.matnr = matnr;
        this.batch = batch;
        this.anfme = anfme;
        this.barcode = barcode;
    }

    public LocDto(String locNo, String matnr, String batch, String orderNo, Double anfme,String barcode) {
        this.locNo = locNo;
        this.matnr = matnr;
        this.batch = batch;
        this.orderNo = orderNo;
        this.anfme = anfme;
        this.barcode = barcode;

    }

    public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme,String barcode) {
        this.locNo = locNo;
        this.matnr = matnr;
        this.maktx = maktx;
        this.batch = batch;
        this.orderNo = orderNo;
        this.anfme = anfme;
        this.barcode = barcode;

    }


    public String getTitle() {
        return this.matnr + "（" + this.maktx + "）";

 src/main/java/com/zy/common/service/CommonService.java

@@ -189,7 +189,7 @@
    public LocMast searchMaxPallet(FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto){
        LocMast targetLocMast = null;
        //查询相同物料
        List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr());
        List<String> locNos = locDetlService.getSameDetlList2(findLocNoAttributeVo.getOrderNo(),findLocNoAttributeVo.getAreaId());
        for (String locNo : locNos) {
            //获取通道组
            List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties,locNo);
@@ -226,6 +226,7 @@
                        .eq("loc_sts", "O")
                        .eq("lev1", lev)
                        .eq("loc_type1",locTypeDto.getLocType1())
                        .eq("loc_type2",findLocNoAttributeVo.getAreaId())
                        .orderBy("bay1", true)
                        .orderBy("row1",true));
                for (LocMast locMast : locMasts) {

 src/main/java/com/zy/common/web/WcsController.java

@@ -308,7 +308,8 @@
        WaitPakin waitPakin1 = waitPakins.get(0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());

        findLocNoAttributeVo.setAreaId(waitPakin1.getAreaId());
        findLocNoAttributeVo.setOrderNo(waitPakin1.getOrderNo());
//        StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
        if (dto == null) {
@@ -470,6 +471,7 @@
        WrkDetl wrkDetl = wrkDetlList.get(0);
        findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());
        findLocNoAttributeVo.setBatch(wrkDetl.getBatch());
        findLocNoAttributeVo.setOrderNo(wrkDetl.getOrderNo());
//        StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
        if (dto == null) {
@@ -615,14 +617,14 @@
                String sourcecLocNo = wrkMast.getSourceLocNo();
                //更新工作明细并清空源库位
                for (WrkDetl wrkDetl : wrkDetls){
                    LocDetl locDetl = locDetlService.selectItem(wrkMast.getSourceLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                    LocDetl locDetl = locDetlService.selectItemCarton(wrkMast.getSourceLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode());
                    if (null != locDetl && wrkMast.getIoType() == 103) {//拣料
                        if (!wrkDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                        if (!wrkDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode())) {
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            throw new CoolException("response.picking_inbound_update_detail_failed");
                        }
                    }else if(wrkMast.getIoType() == 107){//盘点
                        if (!wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                        if (!wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode())) {
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            throw new CoolException("response.picking_inbound_update_detail_failed");
                        }

 src/main/resources/mapper/LocDetlMapper.xml

@@ -44,6 +44,7 @@
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="memo" property="memo" />
        <result column="mix_number" property="mixNumber"/>
    </resultMap>

    <sql id="batchSeq">
@@ -55,9 +56,26 @@
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
        <choose>
            <when test="barcode != null and barcode != ''">
                and barcode = #{barcode}
            </when>
            <otherwise>
                and (barcode IS NULL OR barcode = '')
            </otherwise>
        </choose>
    </sql>

    <select id="selectItem" resultMap="BaseResultMap">
        select top 1 *
        from asr_loc_detl
        where 1=1
        and loc_no = #{locNo}
        and matnr = #{matnr}
        <include refid="batchSeq"></include>
    </select>

    <select id="selectItemCarton" resultMap="BaseResultMap">
        select top 1 *
        from asr_loc_detl
        where 1=1
@@ -417,4 +435,14 @@
        and lm.loc_sts = 'F'
        order by ld.appe_time asc
    </select>

    <select id="getSameDetlList2" resultType="java.lang.String">
        select ld.loc_no from asr_loc_detl as ld
                                  left join asr_loc_mast as lm on ld.loc_no = lm.loc_no
        where 1 = 1
          and ld.order_no = #{orderNo}
          and lm.loc_type2 = #{areaId}
          and lm.loc_sts = 'F'
        order by ld.appe_time asc
    </select>
</mapper>

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -45,7 +45,6 @@
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />

    </resultMap>

    <select id="selectItem" resultMap="BaseResultMap">
@@ -53,6 +52,7 @@
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
        and status &lt; 3
        <choose>
            <when test="batch != null and batch != ''">
                and batch = #{batch}
@@ -61,7 +61,16 @@
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
        <choose>
            <when test="barcode != null and barcode != ''">
                and barcode = #{barcode}
            </when>
            <otherwise>
                and (barcode IS NULL OR barcode = '')
            </otherwise>
        </choose>
    </select>


    <select id="selectItemByOrderNo" resultMap="BaseResultMap">
        select * from man_order_detl
@@ -174,6 +183,7 @@
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}
        and barcode= #{barcode}
        <choose>
            <when test="batch != null and batch != ''">
                and batch = #{batch}
@@ -198,6 +208,14 @@
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
        <choose>
            <when test="barcode != null and barcode != ''">
                and barcode = #{barcode}
            </when>
            <otherwise>
                and (barcode IS NULL OR barcode = '')
            </otherwise>
        </choose>
    </update>

</mapper>

 src/main/resources/mapper/WaitPakinLogMapper.xml

@@ -47,6 +47,7 @@
        <result column="appe_time" property="appeTime" />
        <result column="appe_user" property="appeUser" />
        <result column="memo" property="memo" />
        <result column="area_id" property="areaId"/>
    </resultMap>

</mapper>

 src/main/resources/mapper/WaitPakinMapper.xml

@@ -47,6 +47,7 @@
        <result column="appe_time" property="appeTime" />
        <result column="appe_user" property="appeUser" />
        <result column="memo" property="memo" />
        <result column="area_id" property="areaId"/>
    </resultMap>

</mapper>

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -56,6 +56,14 @@
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
        <choose>
            <when test="barcode != null and barcode != ''">
                and barcode = #{barcode}
            </when>
            <otherwise>
                and (barcode IS NULL OR barcode = '')
            </otherwise>
        </choose>
    </sql>



 src/main/webapp/static/i18n/en.json

@@ -578,6 +578,7 @@
    "response.code_exists":  "Code Exists",
    "response.code_or_name_exists":  "Code or name already exists",
    "response.comb_success":  "Comb Success",
    "response.scan_success":  "Scan Success",
    "response.confirm_complete":  "Confirm Complete",
    "response.confirm_picking_outbound_failed":  "Confirm Picking Outbound Failed",
    "response.crane_add":  "Crane Add",
@@ -786,6 +787,7 @@
    "response.pack_online":  "Pack Online",
    "response.package_inbound_order_type":  "Package Inbound Order Type",
    "response.pallet_comb":  "Pallet Comb",
    "response.carton_scan":  "Add Carton",
    "response.pallet_data_exists":  "Pallet Data Exists",
    "response.param_error":  "Parameter error",
    "response.parameter_error":  "Parameter Error",
@@ -1032,7 +1034,7 @@
    "settle_6":  "Reported",
    "shelf_life":  "Shelf Life",
    "shuttle_board":  "Shuttle Board",
    "sku":  "SKU",
    "sku":  "Buyer Po",
    "small_location":  "Small Location",
    "sort":  "Sort",
    "source_location":  "Source Location",
@@ -1238,7 +1240,7 @@
    "操作日志":  "Operation Log",
    "侧边伸缩":  "Toggle Side",
    "产地":  "Origin",
    "厂家":  "Manufacturer",
    "厂家":  "Container Number",
    "出库":  "Outbound",
    "出库日期":  "Outbound Date",
    "出库数量":  "Outbound Quantity",
@@ -1246,16 +1248,16 @@
    "初始化库位":  "Initialize Location",
    "初始化站点":  "Initialize Station",
    "初始化站点路径":  "Initialize Station Path",
    "代码":  "Code",
    "代码":  "Size",
    "单价":  "Price",
    "单据编号":  "Order No.",
    "单据管理":  "Order Management",
    "单据类型":  "Order Types",
    "单位":  "Unit",
    "单位量":  "Unit Qty",
    "单位量":  "Order Qty",
    "单箱净重":  "Net Weight/Box",
    "单箱毛重":  "Gross Weight/Box",
    "单箱体积":  "Volume/Box",
    "单箱体积":  "Ratio",
    "导出":  "Export",
    "登录":  "Login",
    "订单出库":  "Order Outbound",
@@ -1307,8 +1309,8 @@
    "工作状态删除":  "Delete Work Status",
    "工作状态添加":  "Add Work Status",
    "工作状态修改":  "Modify Work Status",
    "供应商":  "Supplier",
    "供应商编码":  "Supplier Code",
    "供应商":  "SO/OC",
    "供应商编码":  "PO Internal",
    "关闭当前":  "Close Current",
    "关闭当前标签页":  "Close Current Tab",
    "关闭其他":  "Close Others",
@@ -1316,7 +1318,7 @@
    "关闭所有":  "Close All",
    "关闭所有标签页":  "Close All Tabs",
    "归类管理":  "Category Management",
    "规格":  "Spec",
    "规格":  "style",
    "货位档案数据导入":  "Import Location Data",
    "获取同组货架的空库位":  "Get Empty Location in Group",
    "基本资料":  "Basic Information",
@@ -1379,10 +1381,10 @@
    "路径站点设置":  "Path & Station Setup",
    "盘点":  "Inventory Check",
    "盘点出库":  "Inventory CheckOut",
    "批号":  "Batch No.",
    "批号":  "Carton Number Ctn",
    "品号移交":  "Item Handover",
    "品牌":  "Brand",
    "品项数":  "Item Count",
    "品项数":  "Inspection Document Number",
    "凭证记录":  "Credential Records",
    "请输入":  "Please enter",
    "请选择您要使用的模块":  "Please select the module you want to use",
@@ -1431,11 +1433,13 @@
    "数量":  "Quantity",
    "刷新":  "Refresh",
    "搜索":  "Search",
    "条码":  "Barcode",
    "条码":  "Carton Barcode",
    "托盘码":  "Pallet Code",
    "托盘码打印":  "Print Pallet Code",
    "托盘条码":  "Pallet Barcode",
    "危险品":  "Hazardous",
    "危险品":  "Carton Status(Pack/Open)",
    "卖家标签":  "Buyer Label Barcode",
    "组合标签":  "Combined Label",
    "系统管理":  "System Management",
    "系统配置":  "System Configuration",
    "系统用户":  "System Users",
@@ -1446,7 +1450,7 @@
    "系统用户修改":  "Update System User",
    "下线组托":  "Offline Palletizing",
    "先入品处理":  "FIFO Handling",
    "箱子尺寸":  "Box Size",
    "箱子尺寸":  "Buyer",
    "详情":  "Detail",
    "修改人员":  "Updated By",
    "修改时间":  "Updated Time",
@@ -1466,7 +1470,7 @@
    "站点删除":  "Delete Station",
    "站点添加":  "Add Station",
    "站点修改":  "Modify Station",
    "制购":  "Make/Buy",
    "制购":  "Pack Type(Solid/Ratio)",
    "滞留天数":  "Retention Days",
    "重置":  "Reset",
    "主题":  "Theme",

 src/main/webapp/static/i18n/zh-cn.json

@@ -478,6 +478,7 @@
    "response.code_exists":  "编码已存在",
    "response.code_or_name_exists":  "编码或名称已存在",
    "response.comb_success":  "组托成功",
    "response.scan_success":  "扫描成功",
    "response.confirm_complete":  "确认完成",
    "response.confirm_picking_outbound_failed":  "确认拣料出库失败",
    "response.crane_add":  "堆垛机新增",

 src/main/webapp/static/js/adjDetl/adjDetl.js

@@ -177,7 +177,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -216,7 +216,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -322,7 +322,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/api/api.js

@@ -125,7 +125,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -164,7 +164,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -247,7 +247,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basCrnError/basCrnError.js

@@ -131,7 +131,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -170,7 +170,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -251,7 +251,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -287,7 +287,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -342,7 +342,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basCrnOpt/basCrnOpt.js

@@ -130,7 +130,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -169,7 +169,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -277,7 +277,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basCrnStatus/basCrnStatus.js

@@ -130,7 +130,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -169,7 +169,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -250,7 +250,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -286,7 +286,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -341,7 +341,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basCrnp/basCrnp.js

@@ -155,7 +155,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -194,7 +194,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -275,7 +275,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -311,7 +311,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -347,7 +347,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -384,7 +384,7 @@
                                    } else if (res.code === 403){
                                        parent.location.href = "/";
                                    }else {
                                        layer.msg(res.msg)
                                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                    }
                                }
                            })
@@ -420,7 +420,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -456,7 +456,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -493,7 +493,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -529,7 +529,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -599,7 +599,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basDevp/basDevp.js

@@ -163,11 +163,11 @@
            success: function (res) {
                if (res.code === 200){
                    $(".layui-laypage-btn")[0].click();
                    layer.msg(res.msg);
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })
@@ -269,7 +269,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -308,7 +308,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -327,13 +327,13 @@
            async: false,
            success: function (res) {
                if (res.code === 200){
                    layer.msg(res.msg);
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                    layer.closeAll();
                    tableReload(false);
                } else if (res.code === 403){
                    parent.location.href = "/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })
@@ -412,7 +412,7 @@
                                    } else if (res.code === 403){
                                        parent.location.href = "/";
                                    }else {
                                        layer.msg(res.msg)
                                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                    }
                                }
                            })
@@ -448,7 +448,7 @@
                                    } else if (res.code === 403){
                                        parent.location.href = "/";
                                    }else {
                                        layer.msg(res.msg)
                                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                    }
                                }
                            })
@@ -531,7 +531,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basErrLog/basErrLog.js

@@ -136,7 +136,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -175,7 +175,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -289,7 +289,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basLocSts/basLocSts.js

@@ -140,7 +140,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -179,7 +179,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -258,7 +258,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -293,7 +293,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -344,7 +344,7 @@
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    layer.msg(res.msg);
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                    setTimeout(function () {
                        var index = parent.layer.getFrameIndex(window.name);
                        parent.layer.close(index);
@@ -353,7 +353,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })

 src/main/webapp/static/js/basPlcerror/basPlcerror.js

@@ -119,7 +119,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -158,7 +158,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -237,7 +237,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basWhs/basWhs.js

@@ -130,7 +130,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -169,7 +169,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -251,7 +251,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -287,7 +287,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -342,7 +342,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basWrkIotype/basWrkIotype.js

@@ -141,7 +141,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -180,7 +180,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -259,7 +259,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -294,7 +294,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -350,7 +350,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/basWrkStatus/basWrkStatus.js

@@ -138,7 +138,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -177,7 +177,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -256,7 +256,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -291,7 +291,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -346,7 +346,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/common.js

@@ -92,7 +92,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        });
@@ -123,7 +123,7 @@
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }  else {
                        layer.msg(res.msg);
                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                    }
                },
                error: function (res, type) {
@@ -154,7 +154,7 @@
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }  else {
                        layer.msg(res.msg);
                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                    }
                },
                error: function (res, type) {
@@ -192,7 +192,7 @@
    ,{field: 'model', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('代码') : '代码', hide: true}
    ,{field: 'color', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('颜色') : '颜色', hide: true}
    ,{field: 'brand', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('品牌') : '品牌', hide: true}
    ,{field: 'unit', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单位') : '单位', hide: false}
    ,{field: 'unit', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单位') : '单位', hide: true}
    ,{field: 'price', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单价') : '单价', hide: true}
    ,{field: 'sku', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('sku') : 'sku', hide: true}
    ,{field: 'units', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单位量') : '单位量', hide: true}
@@ -234,25 +234,27 @@
    ,{field: 'zpallet', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('托盘条码') : '托盘条码', hide: false}

    ,{field: 'specs', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('规格') : '规格', hide: false}
    ,{field: 'model', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('代码') : '代码', hide: true}
    ,{field: 'color', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('颜色') : '颜色', hide: true}
    ,{field: 'model', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('代码') : '代码', hide: false}
    ,{field: 'color', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('颜色') : '颜色', hide: false}
    ,{field: 'brand', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('品牌') : '品牌', hide: true}
    ,{field: 'unit', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单位') : '单位', hide: false}
    ,{field: 'unit', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单位') : '单位', hide: true}
    ,{field: 'price', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单价') : '单价', hide: true}
    ,{field: 'sku', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('sku') : 'sku', hide: true}
    ,{field: 'units', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单位量') : '单位量', hide: true}
    ,{field: 'barcode', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('条码') : '条码', hide: true}
    ,{field: 'sku', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('sku') : 'sku', hide: false}
    ,{field: 'units', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单位量') : '单位量', hide: false}
    ,{field: 'barcode', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('条码') : '条码', hide: false}
    ,{field: 'origin', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('产地') : '产地', hide: true}
    ,{field: 'manu', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('厂家') : '厂家', hide: true}
    ,{field: 'manu', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('厂家') : '厂家', hide: false}
    ,{field: 'manuDate', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('生产日期') : '生产日期', hide: true}
    ,{field: 'itemNum', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('品项数') : '品项数', hide: true}
    ,{field: 'itemNum', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('品项数') : '品项数', hide: false}
    ,{field: 'safeQty', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('安全库存量') : '安全库存量', hide: true}
    ,{field: 'weight', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单箱净重') : '单箱净重', hide: true}
    ,{field: 'length', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单箱毛重') : '单箱毛重', hide: true}
    ,{field: 'volume', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单箱体积') : '单箱体积', hide: true}
    ,{field: 'threeCode', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('箱子尺寸') : '箱子尺寸', hide: true}
    ,{field: 'supp', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('供应商') : '供应商', hide: true}
    ,{field: 'suppCode', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('供应商编码') : '供应商编码', hide: true}
    ,{field: 'volume', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('单箱体积') : '单箱体积', hide: false}
    ,{field: 'threeCode', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('箱子尺寸') : '箱子尺寸', hide: false}
    ,{field: 'supp', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('供应商') : '供应商', hide: false}
    ,{field: 'suppCode', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('供应商编码') : '供应商编码', hide: false}
    ,{field: 'memo', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('卖家标签') : '卖家标签', hide: false}
    ,{field: 'mixNumber', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('组合标签') : '组合标签', hide: true}
    ,{field: 'beBatch$', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('是否批次') : '是否批次', hide: true}
    ,{field: 'deadTime', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('保质期') : '保质期', hide: true}
    ,{field: 'deadWarn', align: 'center',title: (typeof I18n !== 'undefined' && I18n.t) ? I18n.t('预警天数') : '预警天数', hide: true}

 src/main/webapp/static/js/config/config.js

@@ -123,7 +123,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -162,7 +162,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -243,7 +243,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/cool.js

@@ -78,7 +78,7 @@
            } else if (res.code === 403){
                top.location.href = baseUrl+"/";
            } else {
                layer.msg(res.msg)
                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
            }
        }
    });

 src/main/webapp/static/js/errorWrkMast/errorWrkMast.js

@@ -202,7 +202,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -326,7 +326,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/handWrkMast/handWrkMast.js

@@ -222,7 +222,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -346,7 +346,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/host/host.js

@@ -123,7 +123,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -162,7 +162,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -243,7 +243,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/ioWorks/stockIn.js

@@ -86,7 +86,7 @@
                //         } else if (res.code === 403){
                //             top.location.href = baseUrl+"/";
                //         }else {
                //             layer.msg(res.msg)
                //             layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                //         }
                //     }
                // })

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

@@ -177,7 +177,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -218,7 +218,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -298,7 +298,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -334,7 +334,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -370,7 +370,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -436,7 +436,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/locDetlStatis/locDetlStatis.js

@@ -216,7 +216,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/locMast/locMast.js

@@ -184,7 +184,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -223,7 +223,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -356,7 +356,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -393,7 +393,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -429,7 +429,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -451,13 +451,13 @@
            async: false,
            success: function (res) {
                if (res.code === 200){
                    layer.msg(res.msg);
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                    layer.closeAll();
                    tableReload(false);
                } else if (res.code === 403){
                    parent.location.href = "/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })
@@ -529,7 +529,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/manLocDetl/manLocDetl.js

@@ -165,7 +165,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -206,7 +206,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -286,7 +286,7 @@
                                    } else if (res.code === 403){
                                        parent.location.href = "/";
                                    }else {
                                        layer.msg(res.msg)
                                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                    }
                                }
                            })
@@ -322,7 +322,7 @@
                                    } else if (res.code === 403){
                                        parent.location.href = "/";
                                    }else {
                                        layer.msg(res.msg)
                                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                    }
                                }
                            })
@@ -358,7 +358,7 @@
                                    } else if (res.code === 403){
                                        parent.location.href = "/";
                                    }else {
                                        layer.msg(res.msg)
                                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                    }
                                }
                            })
@@ -425,7 +425,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/mat/mat.js

@@ -185,7 +185,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -224,7 +224,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -424,7 +424,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })

 src/main/webapp/static/js/matTurn/matTurn.js

@@ -110,7 +110,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })

 src/main/webapp/static/js/nodeTree.js

@@ -61,7 +61,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })

 src/main/webapp/static/js/operateLog/operateLog.js

@@ -174,7 +174,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -218,7 +218,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -297,7 +297,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -339,7 +339,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/order/order.js

@@ -357,8 +357,10 @@
                            return;
                        }
                        layer.confirm(I18n.t('confirm_delete_data'), {
                            title: I18n.t('info'),
                            shade: .1,
                            skin: 'layui-layer-admin'
                            skin: 'layui-layer-admin',
                            btn: [I18n.t('confirm'), I18n.t('cancel')]
                        }, function (i) {
                            layer.close(i);
                            for (var j = 0; j < xxDataList.length; j++) {
@@ -487,8 +489,10 @@
    // 删除单据
    function doDel(orderId) {
        layer.confirm(I18n.t('confirm_delete'), {
            title: I18n.t('info'),
            shade: .1,
            skin: 'layui-layer-admin'
            skin: 'layui-layer-admin',
            btn: [I18n.t('confirm'), I18n.t('cancel')]
        }, function (i) {
            layer.close(i);
            layer.load(2);

 src/main/webapp/static/js/pakStore/emptyIn.js

@@ -26,7 +26,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })
@@ -47,7 +47,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })

 src/main/webapp/static/js/pakStore/emptyOut.js

@@ -32,7 +32,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })

 src/main/webapp/static/js/pakStore/stockOut.js

@@ -167,7 +167,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        });

 src/main/webapp/static/js/permission/permission.js

@@ -122,7 +122,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -161,7 +161,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -236,7 +236,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -277,7 +277,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/report/inOut.js

@@ -134,7 +134,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/report/reportStockUse.js

@@ -135,7 +135,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/report/stayTime.js

@@ -159,7 +159,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/report/workCountIn.js

@@ -114,7 +114,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/report/workCountOut.js

@@ -113,7 +113,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/report/workIn.js

@@ -143,7 +143,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/report/workOut.js

@@ -145,7 +145,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/resource/resource.js

@@ -124,7 +124,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -163,7 +163,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -238,7 +238,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -280,7 +280,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/role/role.js

@@ -27,7 +27,7 @@
            } else if (res.code === 403){
                top.location.href = baseUrl+"/";
            } else {
                layer.msg(res.msg)
                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
            }
        }
    })
@@ -183,7 +183,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -222,7 +222,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -300,7 +300,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -353,7 +353,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/role/rolePower.js

@@ -28,7 +28,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.closeAll("loading");
            }
@@ -69,7 +69,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        });

 src/main/webapp/static/js/rowLastno/rowLastno.js

@@ -141,7 +141,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -180,7 +180,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -260,7 +260,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -297,7 +297,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -361,7 +361,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

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

@@ -164,7 +164,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -205,7 +205,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -285,7 +285,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -321,7 +321,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -357,7 +357,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -423,7 +423,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/saas/locMove.js

@@ -153,11 +153,11 @@
                        limit();clearSelect();
                    }
                });
                layer.msg(res.msg);
                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
            } else if (res.code === 403) {
                top.location.href = baseUrl + "/";
            } else {
                layer.msg(res.msg);
                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
            }
        }
    })

 src/main/webapp/static/js/staDesc/staDesc.js

@@ -87,7 +87,7 @@
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg)
                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                    }
                }
            })
@@ -163,7 +163,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -202,7 +202,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -243,13 +243,13 @@
            async: false,
            success: function (res) {
                if (res.code === 200){
                    layer.msg(res.msg);
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                    layer.closeAll();
                    tableReload(false);
                } else if (res.code === 403){
                    parent.location.href = "/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })
@@ -326,7 +326,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -362,7 +362,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -398,7 +398,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -434,7 +434,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -470,7 +470,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -530,7 +530,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/stkPlcm/stkPlcm.js

@@ -129,7 +129,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -168,7 +168,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -248,7 +248,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -284,7 +284,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -320,7 +320,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -356,7 +356,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -392,7 +392,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -456,7 +456,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/stoMan/stoQue.js

@@ -241,7 +241,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });

 src/main/webapp/static/js/tagTree.js

@@ -60,7 +60,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })

 src/main/webapp/static/js/trayCode/trayCode.js

@@ -150,7 +150,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -251,7 +251,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }
@@ -338,7 +338,7 @@
                                        } else if (res.code === 403){
                                            top.location.href = baseUrl+"/";
                                        } else {
                                            layer.msg(res.msg)
                                            layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                        }
                                    }
                                })
@@ -350,7 +350,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
            }
        })

 src/main/webapp/static/js/userLogin/userLogin.js

@@ -122,7 +122,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -161,7 +161,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -236,7 +236,7 @@
                                    } else if (res.code === 403){
                                        parent.location.href = "/";
                                    }else {
                                        layer.msg(res.msg)
                                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                    }
                                }
                            })
@@ -275,7 +275,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/waitPakin/waitPakin.js

@@ -2,7 +2,7 @@
function getCol() {
    var cols = [ {type: 'checkbox'} ];
    cols.push.apply(cols, typeof getDetlCols === 'function' ? getDetlCols() : detlCols);
    cols.push({field: 'locNo', align: 'center',title: typeof I18n !== 'undefined' ? I18n.t('location_no') : '库位号'}
    cols.push({field: 'locNo', align: 'center',title: typeof I18n !== 'undefined' ? I18n.t('location_no') : '库位号',hide:true}
        ,{field: 'status', align: 'center',title: typeof I18n !== 'undefined' ? I18n.t('data_status') : '数据状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='"+(typeof I18n !== 'undefined' ? I18n.t('normal') : '正常')+"|"+(typeof I18n !== 'undefined' ? I18n.t('locked') : '锁定')+"' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status === 'Y'){html += " checked ";}
@@ -103,7 +103,7 @@
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'msg': typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
@@ -186,7 +186,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg, {icon: 2})
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -233,7 +233,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg)
                                }
                            }
                        })
@@ -276,7 +276,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg)
                            }
                        }
                    });
@@ -355,7 +355,7 @@
                                   } else if (res.code === 403){
                                       top.location.href = baseUrl+"/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg)
                                   }
                               }
                           })
@@ -391,7 +391,7 @@
                                   } else if (res.code === 403){
                                       top.location.href = baseUrl+"/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg)
                                   }
                               }
                           })
@@ -452,7 +452,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg)
                }
                layer.close(index);
            }

 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js

@@ -200,7 +200,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -243,7 +243,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -322,7 +322,7 @@
                                   } else if (res.code === 403){
                                       top.location.href = baseUrl+"/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -358,7 +358,7 @@
                                   } else if (res.code === 403){
                                       top.location.href = baseUrl+"/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -420,7 +420,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/wrkDetl/wrkDetl.js

@@ -209,7 +209,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -251,7 +251,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -331,7 +331,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -367,7 +367,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -435,7 +435,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js

@@ -132,7 +132,7 @@
                                    } else if (res.code === 403){
                                        top.location.href = baseUrl+"/";
                                    } else {
                                        layer.msg(res.msg)
                                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                    }
                                }
                            })
@@ -171,7 +171,7 @@
                                } else if (res.code === 403) {
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        });
@@ -250,7 +250,7 @@
                                       } else if (res.code === 403){
                                           top.location.href = baseUrl+"/";
                                       }else {
                                           layer.msg(res.msg)
                                           layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                       }
                                   }
                               })
@@ -286,7 +286,7 @@
                                       } else if (res.code === 403){
                                           top.location.href = baseUrl+"/";
                                       }else {
                                           layer.msg(res.msg)
                                           layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                       }
                                   }
                               })
@@ -354,7 +354,7 @@
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg)
                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                    }
                    layer.close(index);
                }

 src/main/webapp/static/js/wrkLastno/wrkLastno.js

@@ -129,7 +129,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -168,7 +168,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -249,7 +249,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -285,7 +285,7 @@
                                   } else if (res.code === 403){
                                       parent.location.href = "/";
                                   }else {
                                       layer.msg(res.msg)
                                       layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                   }
                               }
                           })
@@ -343,7 +343,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -142,11 +142,11 @@
                        layer.closeAll();
                        if (res.code === 200){
                            $(".layui-laypage-btn")[0].click();
                            layer.msg(res.msg);
                            layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                        } else if (res.code === 403){
                            top.location.href = baseUrl+"/";
                        } else {
                            layer.msg(res.msg)
                            layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                        }
                    }
                })
@@ -172,11 +172,11 @@
                        layer.closeAll();
                        if (res.code === 200){
                            $(".layui-laypage-btn")[0].click();
                            layer.msg(res.msg);
                            layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                        } else if (res.code === 403){
                            top.location.href = baseUrl+"/";
                        } else {
                            layer.msg(res.msg)
                            layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                        }
                    }
                })
@@ -215,7 +215,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -254,7 +254,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -434,7 +434,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js

@@ -218,7 +218,7 @@
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                                }
                            }
                        })
@@ -257,7 +257,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    });
@@ -405,7 +405,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                }
                layer.close(index);
            }

 src/main/webapp/static/layuiadmin/layui/css/modules/layim/html/msgbox.html

@@ -85,7 +85,7 @@
      page: page || 1
    }, function(res){
      if(res.code != 0){
        return layer.msg(res.msg);
        return layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
      }

      //记录来源用户信息
@@ -158,7 +158,7 @@
            ,group: group //我设定的好友分组
          }, function(res){
            if(res.code != 0){
              return layer.msg(res.msg);
              return layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
            }

            //将好友追加到主面板
@@ -189,7 +189,7 @@
          uid: uid //对方用户ID
        }, function(res){
          if(res.code != 0){
            return layer.msg(res.msg);
            return layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
          }
          layer.close(index);
          othis.parent().html('<em>已拒绝</em>');

 src/main/webapp/static/layuiadmin/lib/admin.js

@@ -433,12 +433,12 @@
              if (res.code === 200) {
                alert("激活成功");
                location.reload();
                // layer.msg(res.msg);
                // layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                // layer.close(index);
              } else if (res.code === 403) {
                top.location.href = baseUrl+"/login";
              } else {
                layer.msg(res.msg)
                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
              }
            }
          });

 src/main/webapp/static/layuiadmin/modules/im.js

@@ -239,7 +239,7 @@
            ,remark: remark
          }, function(res){
            if(res.status != 0){
              return layer.msg(res.msg);
              return layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
            }
            layer.msg('好友申请已发送，请等待对方确认', {
              icon: 1

 src/main/webapp/views/detail.html

@@ -118,7 +118,7 @@
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg);
                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                }
            }
        });
@@ -154,13 +154,13 @@
                    method: 'POST',
                    success: function (res) {
                        if (res.code === 200){
                            layer.msg(res.msg);
                            layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                            localStorage.setItem("username", user.username);
                            parent.$('#person-username').text(localStorage.getItem('username'));
                        } else if (res.code === 403){
                            top.location.href = baseUrl+"/";
                        } else {
                            layer.msg(res.msg);
                            layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                        }
                    }
                });

 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -265,7 +265,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl + "/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                            }
                        }
                    })

 src/main/webapp/views/password.html

@@ -128,7 +128,7 @@
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg);
                        layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2});
                    }
                }
            });