From 5bc7091e58978baea6537ca68a6afef5c22f31e7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 12 一月 2024 08:19:23 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 16 +++
src/main/java/com/zy/asrs/controller/OrderController.java | 149 +++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/MatV2Controller.java | 17 +++
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 2
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 5 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/webapp/static/js/order/order.js | 51 ++++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 ++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 ++
src/main/webapp/views/order/order.html | 4
11 files changed, 264 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatV2Controller.java b/src/main/java/com/zy/asrs/controller/MatV2Controller.java
index c390a4a..9be7c40 100644
--- a/src/main/java/com/zy/asrs/controller/MatV2Controller.java
+++ b/src/main/java/com/zy/asrs/controller/MatV2Controller.java
@@ -151,8 +151,21 @@
@RequestMapping(value = "/matV2/auth")
@ManagerAuth
public R find(@RequestParam("matnr") String matnr,@RequestParam("type") Integer type) {
- MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", matnr));
- return R.ok();
+ List<MatV2> matV2s = new ArrayList<>();
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", matnr));;
+ // type: 1锛氬綋鍓嶇墿鏂� 2锛氬綋鍓嶈妭鐐规墍鏈夌墿鏂� 3锛氬瓙鑺傜偣鎵�鏈夌墿鏂�
+ switch (type) {
+ case 1:
+ matV2s = matV2Service.selectList(new EntityWrapper<MatV2>().eq("matnr", matnr));
+ break;
+ case 2:
+ matV2s = matV2Service.selectList(new EntityWrapper<MatV2>().eq("uuid", matV2.getUuid()));
+ break;
+ case 3:
+ matV2s = matV2Service.selectList(new EntityWrapper<MatV2>().eq("uuid", matV2.getTagId()));
+ break;
+ }
+ return R.ok().add(matV2s);
}
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 107ea60..e5bea1a 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -12,12 +12,23 @@
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
import java.util.*;
-
+@Slf4j
@RestController
public class OrderController extends BaseController {
@@ -33,6 +44,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -343,4 +356,138 @@
return R.ok();
}
+ /**
+ * excel瀵煎叆
+ */
+ @PostMapping(value = "/order/excel/import/auth")
+ @ManagerAuth(memo = "閿�鍞崟Excel瀵煎叆")
+ @Transactional
+ public R cstmrExcelImport(MultipartFile file) throws IOException {
+ InputStream inStream = file.getInputStream();
+ String fileMime = file.getContentType();
+ int excelVersion = 2007;
+ if ("application/vnd.ms-excel".equals(fileMime)) {
+ excelVersion = 2003;
+ }
+ Workbook book = null;
+ try {
+ if (excelVersion == 2003) {
+ book = new HSSFWorkbook(inStream);
+ }
+ else { // 褰� excel 鏄� 2007 鏃�
+ book = new XSSFWorkbook(inStream);
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ return R.error("瀵煎叆鏂囦欢鏍煎紡閿欒锛岃浣跨敤xls鍚庣紑鐨勬枃浠讹紒");
+ }
+
+ Sheet sheet = book.getSheetAt(0);
+ int totalRows = sheet.getLastRowNum() + 1; // 鎬�
+ Long userId = getUserId();
+ Date now = new Date();
+ DataFormatter dataFormatter = new DataFormatter();
+ for (int i = 1; i < totalRows; i++) {
+ Row row = sheet.getRow(i);
+ // 璁㈠崟缂栧彿
+ String uuid = dataFormatter.formatCellValue(row.getCell(0));
+ // 鍟嗗搧鍚嶇О
+ String maktx = dataFormatter.formatCellValue(row.getCell(1));
+ // 鍟嗗搧缂栫爜
+ String matnr = dataFormatter.formatCellValue(row.getCell(2));
+ // 鏁伴噺
+ Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
+ // 涓嬪崟鏃堕棿
+ String timeStr = dataFormatter.formatCellValue(row.getCell(4));
+
+ if (Cools.isEmpty(timeStr)) {
+ timeStr = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(now);
+ }
+ // 鍗曟嵁绫诲瀷
+ Long orderType = Long.parseLong(dataFormatter.formatCellValue(row.getCell(5)));
+ Date time = null;
+ try {
+ time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
+ } catch (Exception e) {
+ throw new CoolException("绗�" + i + "琛屼笅鐨勯偅鏃堕棿瑙ｆ瀽澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ // 鍟嗗搧绯诲垪
+ String tagName = dataFormatter.formatCellValue(row.getCell(5));
+ // 瑙勬牸
+ String specs = dataFormatter.formatCellValue(row.getCell(6));
+
+ Mat mat = matService.selectByMatnr(matnr);
+ if (null == mat) {
+ throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
+ }
+
+ Order order = orderService.selectByNo(uuid);
+ if (null == order) {
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ uuid, // 璁㈠崟缂栧彿
+ timeStr, // 鍗曟嵁鏃ユ湡
+ orderType, // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null);
+ if (orderDetl == null) {
+ orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(null);
+ orderDetl.setAnfme(anfme);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(userId);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ } else {
+ if(!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
+ }
+ return R.ok("瀵煎叆鎴愬姛");
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index c1b2331..79db4e5 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -38,4 +38,6 @@
Integer checkAllDetlFinish(@Param("orderNo") String orderNo);
Integer sameOrderComb(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+
+ int increaseAnfme(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 613de86..76c4d3c 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -41,4 +41,6 @@
Boolean checkAllDetlFinish(String orderNo);
Integer sameOrderComb(String orderNo, String matnr, String batch);
+
+ boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 5229cd2..20e0152 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -79,9 +79,10 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
-
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private MatV2Service matV2Service;
@Override
@Transactional
public void comb(CombParam param, Long userId) {
@@ -136,11 +137,16 @@
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ waitPakin.sync(matV2);
+ } else {
+ waitPakin.sync(mat);
+ }
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c0d7dd4..0553e91 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -60,6 +60,8 @@
private NodeService nodeService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private MatV2Service matV2Service;
@Override
@Transactional
@@ -125,11 +127,16 @@
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ orderDetl.sync(matV2);
+ } else {
+ orderDetl.sync(mat);
+ }
//鎵瑰彿涓虹┖浼氬嚭鐜伴棶棰橈紝璁剧疆涓�涓粯璁ゅ��
if (detlDto.getBatch() == null) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 6d40844..9cc6040 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -108,4 +108,9 @@
Integer sum = this.baseMapper.sameOrderComb(orderNo, matnr, batch);
return sum != null ? sum : 0;
}
+
+ @Override
+ public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) {
+ return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 5a67e61..9123f37 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -210,10 +210,6 @@
LocMast locMast = locMastService.selectById(dto.getLocNo());
Integer outSta = staNo.getDevNo();
- //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷ｆ枡绔欐寚瀹氫负202
- if(locMast.getCrnNo()==2){
- outSta = ioType == 101 ? 204 : 202;
- }
// 鑾峰彇璺緞
StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index b142b82..ebca6c0 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -218,4 +218,20 @@
</choose>
</update>
+ <update id="increaseAnfme">
+ update man_order_detl
+ set anfme = anfme + #{qty}
+ where 1=1
+ and order_id = #{orderId}
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </update>
+
</mapper>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e9df873..4aeba9a 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -1,4 +1,6 @@
var insTbCount = 0;
+var admin;
+var insTb
var printMatCodeNos = [];
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
@@ -8,7 +10,7 @@
var form = layui.form;
var table = layui.table;
var util = layui.util;
- var admin = layui.admin;
+ admin = layui.admin;
var xmSelect = layui.xmSelect;
var layDate = layui.laydate;
@@ -83,6 +85,11 @@
// 娣诲姞
$("#orderAddBtn").click(function () {
showEditModel();
+ });
+
+ // 瀵煎叆閿�鍞崟
+ $("#importOrder").click(function () {
+ $("#importExcel").trigger("click");
});
// 宸ュ叿鏉＄偣鍑讳簨浠�
@@ -556,3 +563,45 @@
})
}
});
+function upload(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭瀵煎叆 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/order/excel/import/auth";
+ var form = new FormData();
+ form.append("file", file);
+ let xhr = new XMLHttpRequest();
+ xhr.open("post", url, true);
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete;
+ xhr.onerror = uploadFailed;
+ xhr.onloadend = function () {
+ layer.closeAll('loading');
+ };
+ // xhr.upload.onprogress = progressFunction;
+ xhr.upload.onloadstart = function(){
+ ot = new Date().getTime();
+ oloaded = 0;
+ };
+ xhr.send(form);
+ }, function(index){
+ });
+}
+function uploadComplete(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload({page: {curr: 1}});
+ } else {
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
+}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 2490ca9..a60ab10 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -83,6 +83,10 @@
</button>
<button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞
</button>
+ <button id="importOrder" class="layui-btn icon-btn btn-add">
+ <i class="layui-icon layui-icon-upload"></i> 瀵煎叆閿�鍞崟
+ </button>
+ <input style="display:none" id="importExcel" type="file" onchange="upload(this)" >
</div>
</div>
</div>
--
Gitblit v1.9.1