From 84d7dbea21cbe9276bd1eccdb3e60daef095242e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 六月 2021 11:33:57 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms
---
src/main/java/com/zy/common/service/erp/ErpService.java | 27 ++--
src/main/java/com/zy/common/service/erp/entity/CPICMO.java | 6 +
src/main/webapp/static/js/salesOrder/erpOrder.js | 90 ++++++++++++++++++
src/main/java/com/zy/asrs/controller/ERPrelevantController.java | 40 ++++++++
src/main/webapp/views/salesOrder/erpOrder.html | 81 ++++++++++++++++
src/main/webapp/static/js/salesOrder/salsesOrder.js | 19 ++-
src/main/webapp/static/js/locNormal/normalReport.js | 15 +-
7 files changed, 249 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ERPrelevantController.java b/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
new file mode 100644
index 0000000..5dad7f7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
@@ -0,0 +1,40 @@
+package com.zy.asrs.controller;
+
+import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.service.MatCodeService;
+import com.zy.common.service.erp.ErpService;
+import com.zy.common.service.erp.entity.CPICMO;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+@RestController
+public class ERPrelevantController extends BaseController {
+ @Autowired
+ private ErpService erpService;
+ @Autowired
+ private MatCodeService matCodeService;
+
+ @RequestMapping(value = "/erp/cpicmo/query")
+ @ManagerAuth
+ public R add(String fbillNo, String fsourceBillNo) {
+ List<CPICMO> erpCPICMOlist = erpService.queryErpCPICMO(fbillNo, fsourceBillNo);
+ if (erpCPICMOlist.size() > 0) {
+ for (CPICMO erpList : erpCPICMOlist) {
+ MatCode matCodeObj = matCodeService.selectById(erpList.getFnumber());
+ if (!Cools.isEmpty(matCodeObj)) {
+ erpList.setFname(matCodeObj.getMatName());
+ erpList.setFmodel(matCodeObj.getStr3());
+ }
+ }
+ }
+ return R.ok().add(erpCPICMOlist);
+ }
+}
diff --git a/src/main/java/com/zy/common/service/erp/ErpService.java b/src/main/java/com/zy/common/service/erp/ErpService.java
index fe5c779..623c72a 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -332,19 +332,6 @@
}
-
-
-
-
-
-
-
-
-
-
-
-
-
public boolean updateFnumber(Integer itemId, String FNumber){
String sql = "update InStockbillEntry set Fnumber = ''{0}'' where FItemID = {1,number,#}";
sql = MessageFormat.format(sql, FNumber, itemId);
@@ -357,4 +344,18 @@
return erpSqlServer.update(sql) > 0;
}
+ public List<CPICMO> queryErpCPICMO(String fbillNo, String fsourceBillNo) {
+ String sql = "select * from CPICMO";
+ if (!Cools.isEmpty(fbillNo) && Cools.isEmpty(fsourceBillNo)) {
+ sql = "select * from CPICMO where FBillNo = ''{0}''";
+ sql = MessageFormat.format(sql, fbillNo);
+ } else if (Cools.isEmpty(fbillNo) && !Cools.isEmpty(fsourceBillNo)) {
+ sql = "select * from CPICMO where FSourceBillNo = ''{0}''";
+ sql = MessageFormat.format(sql, fsourceBillNo);
+ } else if (!Cools.isEmpty(fbillNo) && !Cools.isEmpty(fsourceBillNo)) {
+ sql = "select * from CPICMO where FBillNo = ''{0}'' and FSourceBillNo = ''{1}''";
+ sql = MessageFormat.format(sql, fbillNo, fsourceBillNo);
+ }
+ return erpSqlServer.select(sql, CPICMO.class);
+ }
}
diff --git a/src/main/java/com/zy/common/service/erp/entity/CPICMO.java b/src/main/java/com/zy/common/service/erp/entity/CPICMO.java
index 89e1264..43afb20 100644
--- a/src/main/java/com/zy/common/service/erp/entity/CPICMO.java
+++ b/src/main/java/com/zy/common/service/erp/entity/CPICMO.java
@@ -23,6 +23,12 @@
// 鐗╂枡浠ｇ爜
private String Fnumber;
+ // 鐗╂枡鍚嶇О
+ private String Fname;
+
+ // 瑙勬牸
+ private String Fmodel;
+
// 鐢宠鏁伴噺锛堥渶鍏ュ簱鏁伴噺锛�
private Double FAuxQty;
diff --git a/src/main/webapp/static/js/locNormal/normalReport.js b/src/main/webapp/static/js/locNormal/normalReport.js
index 883d25b..480a261 100644
--- a/src/main/webapp/static/js/locNormal/normalReport.js
+++ b/src/main/webapp/static/js/locNormal/normalReport.js
@@ -6,15 +6,16 @@
var cols = [];
cols.push(
{field: 'appeTime$', align: 'center', title: '鍑哄叆搴撴椂闂�', width: 180}
- , {field: 'warehouse', align: 'center', title: '搴撳尯'}
- , {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜'}
+ , {field: 'warehouse', align: 'center', title: '搴撳尯', width: 100}
+ , {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜', width: 140}
, {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О', width: 400}
- , {field: 'lgnum', align: 'center', title: '瑙勬牸'}
- , {field: 'type', align: 'center', title: '鐗╂枡绫诲埆'}
- , {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'}
- , {field: 'supplier', align: 'center', title: '閫氱煡鍗曞彿'}
+ , {field: 'anfme', align: 'center', title: '鏁伴噺', width: 120}
+ , {field: 'lgnum', align: 'center', title: '瑙勬牸', width: 120}
+ , {field: 'type', align: 'center', title: '鐗╂枡绫诲埆', width: 120}
+ , {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿', width: 140}
+ , {field: 'supplier', align: 'center', title: '閫氱煡鍗曞彿', width: 140}
, {field: 'altme', align: 'center', title: '鍗曚綅', hide: true}
- , {field: 'anfme', align: 'center', title: '鏁伴噺'}
+ , {field: 'memo', align: 'center', title: '澶囨敞'}
)
return cols;
}
diff --git a/src/main/webapp/static/js/salesOrder/erpOrder.js b/src/main/webapp/static/js/salesOrder/erpOrder.js
new file mode 100644
index 0000000..26b863c
--- /dev/null
+++ b/src/main/webapp/static/js/salesOrder/erpOrder.js
@@ -0,0 +1,90 @@
+function getCol() {
+ var cols = [];
+ cols.push(
+ {field: 'fbillNo', align: 'center', title: '閫氱煡鍗曞彿', width: 180}
+ , {field: 'fsourceBillNo', align: 'center', title: '鐢熶骇鍗曞彿', width: 180}
+ , {field: 'fnumber', align: 'center', title: '鐗╂枡缂栫爜', width: 180}
+ , {field: 'fname', align: 'center', title: '鐗╂枡鍚嶇О'}
+ , {field: 'fmodel', align: 'center', title: '瑙勬牸', width: 180}
+ );
+ return cols;
+}
+
+layui.use(['table', 'laydate', 'form', 'upload'], function () {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var upload = layui.upload;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#salesOrder',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl + '/erp/cpicmo/query',
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'data': res.data
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ }
+ }
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ tableReload(false);
+ });
+
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '.layui-laydate-range'
+ , style: 'width: 150px'
+ , range: true
+ });
+});
+
+/* 琛ㄦ牸鏁版嵁閲嶈浇 */
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ }
+ limit(child);
+ }
+ });
+}
+
+/* 鐩戝惉鍥炶溅浜嬩欢 */
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/src/main/webapp/static/js/salesOrder/salsesOrder.js b/src/main/webapp/static/js/salesOrder/salsesOrder.js
index f3159b4..1b9da5e 100644
--- a/src/main/webapp/static/js/salesOrder/salsesOrder.js
+++ b/src/main/webapp/static/js/salesOrder/salsesOrder.js
@@ -4,18 +4,19 @@
function getCol() {
var cols = [];
cols.push(
- {field: 'orderCode', align: 'center', title: '璁㈠崟缂栧彿'}
- , {field: 'orderDate', align: 'center', title: '璁㈠崟鏃ユ湡'}
- , {field: 'invCode', align: 'center', title: '鐗╂枡缂栫爜'}
- , {field: 'invName', align: 'center', title: '鐗╂枡鍚嶇О'}
- , {field: 'invStd', align: 'center', title: '瑙勬牸鍨嬪彿'}
- , {field: 'invUnit', align: 'center', title: '鍗曚綅'}
- , {field: 'orderQty', align: 'center', title: '璁㈠崟鏁伴噺'}
+ {field: 'orderCode', align: 'center', title: '璁㈠崟缂栧彿', width: 120}
+ , {field: 'orderDate', align: 'center', title: '璁㈠崟鏃ユ湡', width: 180}
+ , {field: 'invCode', align: 'center', title: '鐗╂枡缂栫爜', width: 180}
+ , {field: 'invName', align: 'center', title: '鐗╂枡鍚嶇О', width: 400}
+ , {field: 'invStd', align: 'center', title: '瑙勬牸鍨嬪彿', width: 180}
+ , {field: 'invUnit', align: 'center', title: '鍗曚綅', width: 80}
+ , {field: 'orderQty', align: 'center', title: '璁㈠崟鏁伴噺', width: 120}
+ , {field: 'outQty', align: 'center', title: '鍙戣揣鏁伴噺', width: 120}
, {field: 'izMrp', align: 'center', title: '鏄惁mrp璁＄畻', hide: true}
- , {field: 'productQty', align: 'center', title: '鐢熶骇浠诲姟鍗曟暟閲�'}
+ , {field: 'productQty', align: 'center', title: '鐢熶骇浠诲姟鍗曟暟閲�', width: 140}
, {field: 'izReceive', align: 'center', title: '鏄惁鏀舵枡', hide: true}
, {field: 'inQty', align: 'center', title: '浜ф垚鍝佸叆搴撴暟閲�'}
- , {field: 'outQty', align: 'center', title: '鍙戣揣鏁伴噺'}
+
);
return cols;
}
diff --git a/src/main/webapp/views/salesOrder/erpOrder.html b/src/main/webapp/views/salesOrder/erpOrder.html
new file mode 100644
index 0000000..b965ab6
--- /dev/null
+++ b/src/main/webapp/views/salesOrder/erpOrder.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <link rel="stylesheet" href="../../static/css/print.css" media="all">
+</head>
+<style>
+ #search-box {
+ padding: 30px 30px 10px 30px;
+ }
+
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+
+ #data-search-btn {
+ margin-top: 10px;
+ }
+
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+
+ .contain td {
+ border: 1px solid #000;
+ /*line-height: 46px;*/
+ }
+
+ #layui-laydate1 {
+ width: 300px;
+ }
+</style>
+<body>
+
+<div>
+ <!-- 鎼滅储鏍� -->
+ <div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="fbillNo" placeholder="閫氱煡鍗曞彿" autocomplete="off">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="fsourceBillNo" placeholder="鐢熶骇鍗曞彿" autocomplete="off">
+ </div>
+ </div>
+
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储
+ </button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆
+ </button>
+ </div>
+ </div>
+
+ <!-- 琛ㄦ牸 -->
+ <div class="layui-form">
+ <table class="layui-hide" id="salesOrder" lay-filter="salesOrder"></table>
+ </div>
+
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/salesOrder/erpOrder.js"></script>
+
+</body>
+</html>
+
--
Gitblit v1.9.1