自动化立体仓库 - WMS系统
zyx
2024-01-16 e47d6654814f4ac058e46c5f07cbe2f97f82edf4
# 新增库位打印功能
6个文件已修改
14 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MobileController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/PlaController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/web/BaseController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pla/plaDetl.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -420,7 +420,7 @@
    }
    @RequestMapping("/plaDetl/packin/v1")
//    @ManagerAuth(memo="pla入库")
    @ManagerAuth(memo="pla入库")
    public R plaPackIn(@RequestBody JSONObject json){
        String locNo = json.get("locNo").toString();
        String batch = json.get("batch").toString();
src/main/java/com/zy/asrs/controller/PlaController.java
@@ -55,7 +55,7 @@
        excludeTrash(param);
        EntityWrapper<Pla> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        wrapper.orderBy("pakin_time",false);
        wrapper.orderBy("modify_time",false);
        allLike(Pla.class, param.keySet(), wrapper, condition);
        return R.ok(plaService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -139,6 +139,7 @@
            pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
            pla.setHandlerBy(getUser().getUsername());
            pla.setStatus(GlobleParameter.PLA_STATUS_2);
            pla.setModifyTime(new Date());
            pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
            //生成此次作业信息
            PlaQty plaQty = new PlaQty();
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1260,6 +1260,7 @@
        //更新pla明细
        pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
        pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
        pla.setModifyTime(new Date());
        if(pla.getWeightAnfme() <= 0){
            pla.setStatus(GlobleParameter.PLA_STATUS_4);
        }else {
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -118,6 +118,7 @@
            //直接更新pla的库存
            Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo());
            //pla.setStatus(GlobleParameter.PLA_STATUS_0);
            pla.setModifyTime(new Date());
            pla.setWeightAnfme(pla.getWeightAnfme() + plaQty.getOrderWeight());
            pla.setStatus(GlobleParameter.PLA_STATUS_1);
@@ -136,6 +137,7 @@
               throw new CoolException("选中的数据不是暂入库状态,请核对状态");
            }
            pla = this.selectById(pla.getId());
            pla.setModifyTime(new Date());
            pla.setStatus(GlobleParameter.PLA_STATUS_0);
            this.updateById(pla);
        });
src/main/java/com/zy/common/web/BaseController.java
@@ -16,6 +16,7 @@
import com.zy.system.service.UserLoginService;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
@@ -26,6 +27,7 @@
/**
 * Created by vincent on 2019-09-09
 */
@Slf4j
public class BaseController extends AbstractBaseController {
    protected static final String RANGE_TIME_LINK = " - ";
src/main/webapp/static/js/pla/plaDetl.js
@@ -495,7 +495,7 @@
        for(var i=0; i<data.length; i++){
            if(data[i].LAY_CHECKED){
                if(data[i].status === "待入库" || data[i].status === "全部出库"|| data[i].weightAnfme <= data[i].qtyAnfme){
                if(data[i].status === "暂入库" || data[i].status === "待入库" || data[i].status === "全部出库"|| data[i].weightAnfme <= data[i].qtyAnfme){
                    layer.msg("选中的明细还未入库或者已全部出库或者没有剩余可出重量,请重新选择");
                    return;
                }
@@ -543,7 +543,7 @@
        let dataOld = [];
        for(var i=0; i<data.length; i++){
            if(data[i].LAY_CHECKED){
                if(data[i].status === "待入库" || data[i].status === "全部出库"){
                if(data[i].status === "暂入库" || data[i].status === "待入库" || data[i].status === "全部出库"){
                    layer.msg("选中的明细还未入库或者已全部出库,请重新选择");
                    return;
                }