From a1e67a0b1bb0b60f87d2db7db17ec1b093e3b73e Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期五, 19 四月 2024 11:04:44 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/param/PlaMoveParam.java | 20 ++++++++++ src/main/java/com/zy/asrs/controller/MobileController.java | 49 +++++++++++++----------- 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 8a36e05..56fe027 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -527,39 +527,42 @@ */ @RequestMapping("/plaDetl/move/v1") @ManagerAuth - public R plaDetlMove(@RequestBody JSONObject json){ - String brand = json.get("brand").toString(); - String batch = json.get("batch").toString(); - Integer packageNo = Integer.parseInt(json.get("packageNo").toString()); - String locNo = json.get("locNo").toString(); + public R plaDetlMove(@RequestBody PlaMoveParam param){ - if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){ - return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱"); - } - - Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand); - if ((Cools.isEmpty(pla))){ - return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�"); - } - if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)){ - return R.error("璇ュ寘鐗╂枡鐘舵�佷笉涓哄凡鍏ュ簱鐘舵�侊紝鏃犳硶杞Щ"); - } + String locNo = param.getLocNo(); Node node = nodeService.selectByUuid(locNo); if(Cools.isEmpty(node)){ throw new CoolException("搴撲綅淇℃伅涓嶆纭�"); } - String sourceLocNo = pla.getLocNo(); + List<PlaMoveParam.PlaMove> plas = param.getPlas(); - pla.setLocNo(locNo); - pla.setStash(node.getParentName()); - pla.setModifyTime(new Date()); + param.getPlas().forEach(p -> { + String brand = p.getBrand(); + String batch = p.getBatch(); + Integer packageNo = p.getPackageNo(); + if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){ + throw new CoolException("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱"); + } + Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand); + if ((Cools.isEmpty(pla))){ + throw new CoolException("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�"); + } + if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3)){ + throw new CoolException("璇ュ寘鐗╂枡鐘舵�佷笉涓哄叆搴撶姸鎬侊紝鏃犳硶杞Щ"); + } - plaService.updateById(pla); + String sourceLocNo = pla.getLocNo(); + pla.setLocNo(locNo); + pla.setStash(node.getParentName()); + pla.setModifyTime(new Date()); - SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(), - locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop()); + plaService.updateById(pla); + SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(), + locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop()); + + }); return R.ok(); } diff --git a/src/main/java/com/zy/asrs/entity/param/PlaMoveParam.java b/src/main/java/com/zy/asrs/entity/param/PlaMoveParam.java new file mode 100644 index 0000000..82bea93 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/param/PlaMoveParam.java @@ -0,0 +1,20 @@ +package com.zy.asrs.entity.param; + +import lombok.Data; + +import java.util.List; + +@Data +public class PlaMoveParam { + + private String locNo; + + private List<PlaMove> plas; + + @Data + public static class PlaMove { + private String brand; + private String batch; + private Integer packageNo; + } +} -- Gitblit v1.9.1