From 7acc8eb603f91667e506545e7877be61033e1904 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 01 四月 2021 15:32:30 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockIn.html | 2 +-
src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java | 2 ++
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 29 +++++++++++++++++++++++++----
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java
index 8c76126..f8b0983 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java
@@ -15,4 +15,6 @@
private List<MatnrDto> mats;
+ private Integer docType;
+
}
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 6c071b1..ce20355 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
@@ -20,10 +20,7 @@
import zy.cloud.wms.manager.entity.result.StoPrintVo;
import zy.cloud.wms.manager.service.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2021/2/25
@@ -96,6 +93,30 @@
}
}
}
+
+ // 涓婃姤缁檈rp
+ List<BillDto> dtos = new ArrayList<>();
+ for (MatnrDto dto : param.getMats()) {
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(dto.getMatnr());
+ billDto.setQty(dto.getCount());
+ dtos.add(billDto);
+ }
+ Integer docId = Optional.ofNullable(param.getDocType()).orElse(34);
+ String docNum = String.valueOf(snowflakeIdWorker.nextId());
+ switch (docId) {
+ case 34: // 閲囪喘鍗�
+ docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ break;
+ case 45: // 閿�鍞��璐у崟
+ docNum = "SR-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ break;
+ default:
+ break;
+ }
+ if (!erpService.uploadBill(dtos, docId, docNum)) {
+ throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+ }
return R.ok("鍏ュ簱鎴愬姛");
}
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 8341bdc..c1f366f 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -107,7 +107,7 @@
<footer>
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="confirm()" style="margin-left: 15px">涓婃灦</button>
+ <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" style="margin-left: 15px">涓婃灦</button>
</div>
</footer>
--
Gitblit v1.9.1