From 369a35ba1419e964c0eafbe662968fdf4d8344a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 二月 2021 13:02:48 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockIn.html | 1
src/main/java/zy/cloud/wms/common/utils/VersionUtils.java | 18 +++++++++
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 50 ++++++++++++++++++++++++-
3 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java b/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
index 4516cee..08b284e 100644
--- a/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
+++ b/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
@@ -1,6 +1,7 @@
package zy.cloud.wms.common.utils;
import zy.cloud.wms.manager.entity.Comb;
+import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Mat;
/**
@@ -27,6 +28,23 @@
comb.setWeight(mat.getWeight());
}
+ public static void setLocDetl(LocDetl locDetl, Comb comb) {
+ locDetl.setMatnr(comb.getMatnr());
+ locDetl.setMaktx(comb.getMaktx());
+ locDetl.setName(comb.getName());
+ locDetl.setSpecs(comb.getSpecs());
+ locDetl.setModel(comb.getModel());
+ locDetl.setBatch(comb.getBatch());
+ locDetl.setUnit(comb.getUnit());
+ locDetl.setBarcode(comb.getBarcode());
+ locDetl.setDocId(comb.getDocId());
+ locDetl.setDocNum(comb.getDocNum());
+ locDetl.setCustName(comb.getCustName());
+ locDetl.setItemNum(comb.getItemNum());
+ locDetl.setCount(comb.getCount());
+ locDetl.setWeight(comb.getWeight());
+ }
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index b7be0db..34293ea 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -1,13 +1,24 @@
package zy.cloud.wms.manager.service.impl;
-import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.R;
+import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.common.utils.VersionUtils;
+import zy.cloud.wms.manager.entity.Comb;
+import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.param.StockInParam;
+import zy.cloud.wms.manager.service.CombService;
+import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.WorkService;
+
+import java.util.Date;
+import java.util.List;
/**
* Created by vincent on 2021/2/25
@@ -17,14 +28,49 @@
@Autowired
private NodeService nodeService;
+ @Autowired
+ private CombService combService;
+ @Autowired
+ private LocDetlService locDetlService;
@Override
+ @Transactional
public R stockIn(StockInParam param, Long userId) {
Node node = nodeService.selectByUuid(param.getNodeId());
if (node == null) {
return R.error("璐т綅涓嶅瓨鍦�");
}
- System.out.println(JSON.toJSONString(param));
+ List<Comb> combs = combService.selectList(new EntityWrapper<Comb>().eq("zpallet", param.getZpallet()).eq("io_status", 1));
+ if (Cools.isEmpty(combs)) {
+ return R.error("鐗╂枡涓嶅瓨鍦�");
+ }
+ Date now = new Date();
+ for (Comb comb : combs) {
+ // 鏀瑰彉缁勬墭妗ｇ姸鎬�
+ comb.setIoStatus(4);
+ comb.setUpdateBy(userId);
+ comb.setUpdateTime(now);
+ boolean update = combService.update(comb, new EntityWrapper<Comb>().eq("zpallet", param.getZpallet()).eq("matnr", comb.getMatnr()));
+ if (!update) {
+ throw new CoolException("淇敼鎵樼洏璧勬枡妗ｅけ璐�");
+ }
+ // 鏇存柊璐т綅搴撳瓨鏄庣粏
+ LocDetl locDetl = new LocDetl();
+ locDetl.setLocNo(node.getName());
+ locDetl.setNodeId(node.getId());
+ locDetl.setZpallet(param.getZpallet());
+ locDetl.setAnfme(comb.getAnfme());
+ VersionUtils.setLocDetl(locDetl, comb);
+ locDetl.setStatus(1);
+ locDetl.setCreateBy(userId);
+ locDetl.setCreateTime(now);
+ locDetl.setUpdateBy(userId);
+ locDetl.setUpdateTime(now);
+ boolean insert = locDetlService.insert(locDetl);
+ if (!insert) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+ }
return R.ok();
}
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 591af25..08c1b83 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -163,6 +163,7 @@
function findNode(el) {
if (isEmpty(el.value)) {
+ $('#node-ok').hide();
return;
}
$.ajax({
--
Gitblit v1.9.1