From acdcaee563c5cb53729acfc33bd9ddbcbf53f8a9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 三月 2022 16:49:53 +0800
Subject: [PATCH] #杰克缝纫机立库 【优化单据管理】
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 36 ++++++++++++++++++
src/main/java/com/zy/common/model/KeyValueVo.java | 16 ++++++++
src/main/java/com/zy/asrs/utils/VersionUtils.java | 8 ++++
src/main/webapp/static/js/order/order.js | 35 +++++------------
4 files changed, 71 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 6d4c5b2..5c3823d 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -14,10 +14,12 @@
import com.core.common.R;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.MatCodePrint;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
+import com.zy.common.model.KeyValueVo;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
@@ -41,6 +43,40 @@
@Autowired
private MatCodeService matCodeService;
+ /*************************************** xm-select ***********************************************/
+
+ // xm-select 鎼滅储鍟嗗搧鍒楄〃
+ @RequestMapping("/mat/all/get/kv")
+ @ManagerAuth
+ public R getMatDataKV(@RequestParam(required = false) String condition) {
+ Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
+ .andNew().like("mat_no", condition).or().like("mat_name", condition)
+ .orderBy("appe_time", false);
+ List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (MatCode mat : mats) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(mat.getMatNo() + " - " + mat.getMatName());
+ vo.setValue(mat.getMatNo());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
+
+ @RequestMapping(value = "/matCode/covert/{id}/auth")
+ @ManagerAuth
+ public R covert(@PathVariable("id") String id) {
+ MatCode matCode = matCodeService.selectById(String.valueOf(id));
+ if (matCode == null) {
+ return R.ok();
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ VersionUtils.setOrderDetl(orderDetl, matCode);
+ orderDetl.setAnfme(0.0D);
+ return R.ok().add(orderDetl);
+ }
+
+
@RequestMapping(value = "/matCode/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 9c36d7a..4797bbd 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -78,6 +78,14 @@
waitPakIn.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
+ public static void setOrderDetl(OrderDetl orderDetl, MatCode matCode) {
+ orderDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+ orderDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+ orderDetl.setSpecs(matCode.getStr2()); // 瑙勬牸
+ orderDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+ }
+
+
// excel ----------------------------------------------------------------------
public static MatCodeExcel getExcel(MatCode matCode) {
diff --git a/src/main/java/com/zy/common/model/KeyValueVo.java b/src/main/java/com/zy/common/model/KeyValueVo.java
new file mode 100644
index 0000000..0fcca11
--- /dev/null
+++ b/src/main/java/com/zy/common/model/KeyValueVo.java
@@ -0,0 +1,16 @@
+package com.zy.common.model;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2022/3/23
+ */
+@Data
+public class KeyValueVo {
+
+ private String name;
+
+ private String value;
+
+
+}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 69c6a85..0c59c77 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -96,7 +96,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜'},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
- {field: 'count', title: '鏁伴噺'},
+ {field: 'anfme', title: '鏁伴噺'},
{field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -157,13 +157,10 @@
layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
return false;
}
- var param = [];
- var nList = admin.util.deepClone(xxDataList);
- for (var xi = 0; xi < nList.length; xi++) {
- // console.log('宸插叆搴擄細'+nList[xi].inQty)
- // console.log('鏃ф暟閲忥細'+inQtys[xi])
- // console.log('鏁伴噺锛�'+nList[xi].qty)
- if (nList[xi].inQty > 0 && inQtys[xi]!=nList[xi].qty) {
+ let param = [];
+ let nList = admin.util.deepClone(xxDataList);
+ for (let xi = 0; xi < nList.length; xi++) {
+ if (nList[xi].inQty > 0 && inQtys[xi] !== nList[xi].qty) {
layer.msg("宸插叆搴撴棤娉曚慨鏀�", {icon: 2})
return false;
} else if (nList[xi].qty > 0) {
@@ -180,7 +177,7 @@
qty: nList[xi].qty,
inQty: nList[xi].inQty,
})
- }else if (nList[xi].qty == 0){
+ }else if (nList[xi].anfme === 0){
layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
return false;
}
@@ -226,7 +223,7 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '鎵瑰彿'},
{field: 'specs', title: '瑙勬牸'},
- {field: 'count', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
// {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
{field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
@@ -292,7 +289,7 @@
break;
}
}
- } else if (obj.field==='count'){
+ } else if (obj.field==='anfme'){
let vle = Number(obj.value);
if (isNaN(vle)) {
layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
@@ -301,7 +298,7 @@
if (vle > 0) {
for (let i=0;i<xxDataList.length;i++) {
if (xxDataList[i]["matnr"] === obj.data.matnr && xxDataList[i]["batch"] === obj.data.batch) {
- xxDataList[i]["count"] = vle;
+ xxDataList[i]["anfme"] = vle;
break;
}
}
@@ -342,23 +339,13 @@
if (existMats.indexOf(item.value) === -1) {
// 鏌ヨ鐗╂枡璇︽儏
$.ajax({
- url: baseUrl+"/matCode/"+item.value+"/auth",
+ url: baseUrl+"/matCode/covert/"+item.value+"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
success: function (res) {
if (res.code === 200){
- var mat = res.data;
- xxDataList.push({
- matNo: mat.matNo,
- matName: mat.matName,
- color:mat.color,
- size:mat.size,
- specs:mat.specs,
- memo: mat.memo,
- unit: mat.unit,
- qty: 0.0
- });
+ xxDataList.push(res.data);
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
--
Gitblit v1.9.1