#

Junjie

5 天以前 e29200a02010e97f1ba8bb83ba9be867e11876da

#

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

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

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

import java.util.*;

@RestController
public class KcztMapController extends BaseController {

    @Autowired
    private KcztMapService kcztMapService;

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

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

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

    @RequestMapping(value = "/kcztMap/add/auth")
    @ManagerAuth
    public R add(KcztMap kcztMap) {
        kcztMapService.insert(kcztMap);
        return R.ok();
    }

    @RequestMapping(value = "/kcztMap/update/auth")
    @ManagerAuth
    public R update(KcztMap kcztMap){
        if (Cools.isEmpty(kcztMap) || null==kcztMap.getCstateid()){
            return R.error();
        }
        kcztMapService.updateById(kcztMap);
        return R.ok();
    }

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

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

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

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

}

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

@@ -268,6 +268,7 @@
        matParam.setWeight(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
        matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
        matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode());
        matParam.setCstateid(nccJcQilibcBarcodeflowWms.getCstateid());
        return R.ok().add(matParam);

    }
@@ -397,6 +398,7 @@
        List<CombParam.CombMat> combMats = combParam.getCombMats();
        for (CombParam.CombMat mat : combMats) {
            mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
            mat.setCstateid(nccSaleXclGgsybWms.getCstateid());
        }

        mobileService.comb(combParam, getUserId());

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

@@ -60,10 +60,13 @@

    @PostMapping("/out/pakout/preview/auth")
    @ManagerAuth
    public R pakoutPreview(@RequestBody List<Long> ids) {
    public R pakoutPreview(@RequestBody HashMap<String,Object> param) {
        List<Long> ids = (List<Long>) param.get("ids");
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        String cstateid = param.getOrDefault("cstateid", "").toString();

        List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);

        if (orderDetlPakouts.size() == 0) {
@@ -84,8 +87,8 @@
                if (issued <= 0.0D) {
                    continue;
                }
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), cstateid);
                for (LocDetl locDetl : locDetls) {
                    if (issued > 0) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -144,8 +147,8 @@
                if (issued <= 0.0D) {
                    continue;
                }
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), cstateid);
                for (LocDetl locDetl : locDetls) {
                    if (issued > 0) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -229,7 +232,12 @@
                }

                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locNo, ioType);
                User user = getUser();
                User user = null;
                try {
                    user = getUser();
                } catch (Exception e) {

                }
                if(user != null) {
                    Integer defaultOutSta = user.getDefaultOutSta();
                    if(defaultOutSta != null) {

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

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

import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

@Data
@TableName("erp_kczt_map")
public class KcztMap implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value= "")
    @TableId(value = "cstateid", type = IdType.INPUT)
    private String cstateid;

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

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

    public KcztMap() {}

    public KcztMap(String cstateid,String vcode,String vname) {
        this.cstateid = cstateid;
        this.vcode = vcode;
        this.vname = vname;
    }

//    KcztMap kcztMap = new KcztMap(
//            null,    // [非空]
//            null,    // 
//            null    // 
//    );


}

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

@@ -210,6 +210,9 @@
    @ApiModelProperty(value= "是否冻结,0.未冻结，1.已冻结")
    private Integer frozen;

    //库存状态
    private String cstateid;

    public String getLocNo$(){
        LocMastService service = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = service.selectById(this.locNo);
@@ -361,4 +364,13 @@
        return this.boxType1;
    }

    public String getCstateid$() {
        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
        if (!Cools.isEmpty(kcztMap)){
            return String.valueOf(kcztMap.getVname());
        }
        return this.cstateid;
    }

}

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

@@ -359,6 +359,9 @@
    @TableField("remark")
    private String remark;

    //库存状态
    private String cstateid;

    public OrderDetl() {
    }


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

@@ -353,6 +353,9 @@
    @TableField("box_type3")
    private String boxType3 = "";

    //库存状态
    private String cstateid;

    public OrderDetlPakin() {}

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

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

@@ -350,6 +350,9 @@
    @TableField("box_type3")
    private String boxType3 = "";

    //库存状态
    private String cstateid;

    public OrderDetlPakout() {}

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

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

@@ -7,6 +7,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.KcztMapService;
import com.zy.asrs.service.StoreTypeService;
import com.zy.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
@@ -203,6 +204,9 @@
    @TableField("tk_flag")
    private String tkFlag = "";

    //库存状态
    private String cstateid;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){
@@ -295,6 +299,15 @@
        return this.boxType1;
    }

    public String getCstateid$() {
        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
        if (!Cools.isEmpty(kcztMap)){
            return String.valueOf(kcztMap.getVname());
        }
        return this.cstateid;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

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

@@ -7,6 +7,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.KcztMapService;
import com.zy.asrs.service.StoreTypeService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -202,6 +203,9 @@
    @TableField("tk_flag")
    private String tkFlag = "";

    //库存状态
    private String cstateid;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){
@@ -293,4 +297,13 @@
        return this.boxType1;
    }

    public String getCstateid$() {
        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
        if (!Cools.isEmpty(kcztMap)){
            return String.valueOf(kcztMap.getVname());
        }
        return this.cstateid;
    }

}

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

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.KcztMapService;
import com.zy.asrs.service.StoreTypeService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -331,6 +333,9 @@
    @TableField("stock_num2")
    private Double stockNum2;

    //库存状态
    private String cstateid;

    public String getIoTime$() {
        if (Cools.isEmpty(this.ioTime)) {
            return "";
@@ -437,6 +442,15 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getCstateid$() {
        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
        if (!Cools.isEmpty(kcztMap)){
            return String.valueOf(kcztMap.getVname());
        }
        return this.cstateid;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

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

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.KcztMapService;
import com.zy.asrs.service.StoreTypeService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -331,6 +333,9 @@
    @TableField("stock_num2")
    private Double stockNum2;

    //库存状态
    private String cstateid;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";
@@ -429,6 +434,15 @@
        return null;
    }

    public String getCstateid$() {
        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
        if (!Cools.isEmpty(kcztMap)){
            return String.valueOf(kcztMap.getVname());
        }
        return this.cstateid;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

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

@@ -65,6 +65,9 @@
        //
        private String tiaoma;

        //库存状态
        private String cstateid;

    }

}

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

@@ -247,4 +247,7 @@
     */
    private String tiaoma;

    //库存状态
    private String cstateid;

}

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

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

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

@Mapper
@Repository
public interface KcztMapMapper extends BaseMapper<KcztMap> {

}

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

@@ -78,7 +78,7 @@
    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
    List<LocDetl> queryStockAll(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("batch")String batch,
                                @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
                                @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3);
                                @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3,@Param("cstateid") String cstateid);

    Double queryStockAnfme(String matnr, String batch);


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

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

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

public interface KcztMapService extends IService<KcztMap> {

}

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

@@ -67,7 +67,7 @@

    List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);

    List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
    List<LocDetl> queryStockAll(String orderNo, Set<String> locNos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, String cstateid);

    Double queryStockAnfme(String matnr, String batch);


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

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

import com.zy.asrs.mapper.KcztMapMapper;
import com.zy.asrs.entity.KcztMap;
import com.zy.asrs.service.KcztMapService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("kcztMapService")
public class KcztMapServiceImpl extends ServiceImpl<KcztMapMapper, KcztMap> implements KcztMapService {

}

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

@@ -126,10 +126,9 @@
    }



    @Override
    public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
        return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
    public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, String cstateid) {
        return this.baseMapper.queryStockAll(orderNo, locNos, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, cstateid);
    }

    @Override

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

@@ -604,6 +604,7 @@
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
                detlDto.setWeight(elem.getWeight());
                detlDto.setCstateid(elem.getCstateid());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
@@ -639,6 +640,7 @@
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                waitPakin.setTkFlag(param.getTkFlag());
                waitPakin.setCstateid(detlDto.getCstateid());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -675,6 +677,7 @@
                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
                detlDto.setOrderNo(elem.getOrderNo());
                detlDto.setWeight(elem.getWeight());
                detlDto.setCstateid(elem.getCstateid());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
@@ -710,6 +713,7 @@
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                waitPakin.setWeight(detlDto.getWeight());
                waitPakin.setCstateid(detlDto.getCstateid());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }

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

@@ -41,6 +41,8 @@
    //退库组托
    private String tkFlag;

    //库存状态
    private String cstateid;

    public DetlDto() {
    }

 src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java

@@ -93,6 +93,8 @@
     */
    private String ckbm;

    private String cstateid;

    @Override
    public boolean equals(Object that) {
        if (this == that) {

 src/main/resources/mapper/KcztMapMapper.xml

New file
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.KcztMapMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.KcztMap">
        <result column="cstateid" property="cstateid" />
        <result column="vcode" property="vcode" />
        <result column="vname" property="vname" />

    </resultMap>

</mapper>

 src/main/resources/mapper/asrs/LocDetlMapper.xml

@@ -50,6 +50,7 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="cstateid" property="cstateid" />
    </resultMap>

    <sql id="batchSeq">
@@ -556,6 +557,9 @@
        <if test="orderNo != null and orderNo != ''">
            and a.order_no = #{orderNo}
        </if>
        <if test="cstateid != null and cstateid != ''">
            and a.cstateid = #{cstateid}
        </if>

        <include refid="batchSeqA"></include>


 src/main/resources/mapper/asrs/OrderDetlMapper.xml

@@ -53,6 +53,7 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="cstateid" property="cstateid" />

    </resultMap>


 src/main/resources/mapper/asrs/OrderDetlPakinMapper.xml

@@ -53,6 +53,7 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="cstateid" property="cstateid" />

    </resultMap>


 src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml

@@ -53,6 +53,7 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="cstateid" property="cstateid" />
    </resultMap>

    <sql id="standbyAll">

 src/main/resources/mapper/asrs/WaitPakinLogMapper.xml

@@ -54,6 +54,7 @@
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="tk_flag" property="tkFlag" />
        <result column="cstateid" property="cstateid" />
    </resultMap>

</mapper>

 src/main/resources/mapper/asrs/WaitPakinMapper.xml

@@ -54,6 +54,7 @@
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="tk_flag" property="tkFlag" />
        <result column="cstateid" property="cstateid" />
    </resultMap>

    <update id="updateIoStatus">

 src/main/resources/mapper/asrs/WrkDetlLogMapper.xml

@@ -54,6 +54,7 @@
        <result column="stock_num" property="stockNum" />
        <result column="kp_cstmr_name" property="kpCstmrName" />
        <result column="stock_num2" property="stockNum2" />
        <result column="cstateid" property="cstateid" />
    </resultMap>

    <sql id="batchSeq">

 src/main/resources/mapper/asrs/WrkDetlMapper.xml

@@ -54,6 +54,7 @@
        <result column="stock_num" property="stockNum" />
        <result column="kp_cstmr_name" property="kpCstmrName" />
        <result column="stock_num2" property="stockNum2" />
        <result column="cstateid" property="cstateid" />
    </resultMap>

    <sql id="batchSeq">

 src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml

@@ -16,7 +16,8 @@
            <result property="vbillno" column="VBILLNO" />
            <result property="nastnum" column="NASTNUM" />
            <result property="wmsFlag" column="wms_flag" />
        <result property="wmsMemo" column="wms_memo" />
            <result property="wmsMemo" column="wms_memo" />
            <result property="cstateid" column="CSTATEID" />
    </resultMap>

    <sql id="Base_Column_List">

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

@@ -236,6 +236,7 @@
    ,{field: 'model', align: 'center',title: '型号'}
    ,{field: 'supp', align: 'center',title: '客户'}
    ,{field: 'standby1$', align: 'center',title: '仓库'}
    ,{field: 'cstateid$', align: 'center',title: '库存状态'}
    ,{field: 'color', align: 'center',title: '颜色', hide: true}
    ,{field: 'brand', align: 'center',title: '品牌', hide: true}
    ,{field: 'price', align: 'center',title: '单价', hide: true}

 src/main/webapp/static/js/kcztMap/kcztMap.js

New file
@@ -0,0 +1,247 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;

    // 数据渲染
    tableIns = table.render({
        elem: '#kcztMap',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/kcztMap/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'cstateid', align: 'center',title: ''}
            ,{field: 'vcode', align: 'center',title: ''}
            ,{field: 'vname', align: 'center',title: ''}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 监听排序事件
    table.on('sort(kcztMap)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(kcztMap)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               del(checkStatus.map(function (d) {
                   return d.cstateid;
               }));
               break;
            case 'exportData':
                admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'kcztMap': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/kcztMap/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });

    // 监听行工具事件
    table.on('tool(kcztMap)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.cstateid]);
                break;
        }
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender(mData);
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/kcztMap/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/kcztMap/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender(data) {
        setTimeout(function () {
            layDate.render({
                elem: '.layui-laydate-range'
                ,type: 'datetime'
                ,range: true
            });

        }, 300);
    }
    layDateRender();

});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}

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

@@ -17,6 +17,7 @@
        ,{field: 'specs', align: 'center',title: '规格', hide: false}
        ,{field: 'model', align: 'center',title: '型号'}
        ,{field: 'standby1$', align: 'center',title: '仓库'}
        ,{field: 'cstateid$', align: 'center',title: '库存状态'}
        ,{field: 'color', align: 'center',title: '颜色', hide: true}
        ,{field: 'brand', align: 'center',title: '品牌', hide: true}
        ,{field: 'price', align: 'center',title: '单价', hide: true}

 src/main/webapp/static/js/orderPakout/out.js

@@ -190,7 +190,10 @@
            url: baseUrl + "/out/pakout/preview/auth",
            headers: {'token': localStorage.getItem('token')},
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(ids),
            data: JSON.stringify({
                ids: ids,
                cstateid: $("#defaultCstateid").val()
            }),
            method: 'POST',
            success: function (res) {
                layer.close(loadIndex);
@@ -423,8 +426,6 @@
            $("#defaultOutSta").html(res.data)
        } else if (res.code === 403){
            top.location.href = baseUrl+"/";
        } else {
            layer.msg(res.msg, {icon: 2})
        }
    }
})

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

@@ -2,7 +2,9 @@
function getCol() {
    var cols = [ {type: 'checkbox'} ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'locNo', align: 'center',title: '库位号'}
    cols.push(
        {field: 'locNo', align: 'center',title: '库位号'}
        ,{field: 'cstateid$', align: 'center',title: '库存状态'}
        ,{field: 'status', align: 'center',title: '数据状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='正常|锁定'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status === 'Y'){html += " checked ";}

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

@@ -3,7 +3,9 @@
    var cols = [
    ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'locNo', align: 'center',title: '库位号'}
    cols.push(
        {field: 'locNo', align: 'center',title: '库位号'}
        ,{field: 'cstateid$', align: 'center',title: '库存状态'}
        ,{field: 'status', align: 'center',title: '数据状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='正常|锁定' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status === 'Y'){html += " checked ";}

 src/main/webapp/views/kcztMap/kcztMap.html

New file
@@ -0,0 +1,104 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
</head>
<body>

<div class="layui-fluid">
    <div class="layui-card">
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                    </div>
                </div>
            </div>
            <table class="layui-hide" id="kcztMap" lay-filter="kcztMap"></table>
        </div>
    </div>
</div>

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/kcztMap/kcztMap.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="cstateid" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="vcode" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="vname" placeholder="请输入">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>


 src/main/webapp/views/orderPakout/out.html

@@ -143,6 +143,16 @@
                                    修改默认出库口 <span id="defaultOutSta"></span>
                                </button>
                            </div>

                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <select id="defaultCstateid">
                                        <option value="">选择库存状态</option>
                                        <option value="1001A1100000000H0KJN">合格</option>
                                        <option value="1001A110000001B792IV">普通标准</option>
                                    </select>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table id="orderDetlTable" lay-filter="orderDetlTable"></table>