From 20943f263c31beec3f25fcbeb09c73350248e74b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 20 十一月 2023 16:37:05 +0800
Subject: [PATCH] # 1、图号从ERP获取 2、商品档案增加规格和图号搜索
---
src/main/resources/mapper/ViewWorkInMapper.xml | 20 +++------
src/main/webapp/static/js/report/workIn.js | 1
src/main/webapp/views/mat/mat.html | 12 ++++++
src/main/webapp/views/report/viewWorkIn.html | 15 +++++++
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 4 +-
src/main/webapp/static/js/report/workOut.js | 1
src/main/webapp/views/report/viewWorkOut.html | 15 +++++++
src/main/java/com/zy/asrs/mapper/MatMapper.java | 2
src/main/resources/mapper/MatMapper.xml | 6 +++
src/main/java/com/zy/asrs/controller/MatController.java | 4 +
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/asrs/service/MatService.java | 2
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 3 +
13 files changed, 67 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index ede2e37..8719ef1 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -124,7 +124,9 @@
return R.ok(matService.getPage(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
- , param.get("maktx"))
+ , param.get("maktx")
+ , param.get("specs")
+ , param.get("model"))
);
}
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index 22e0d28..056df9f 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -13,7 +13,7 @@
@Repository
public interface MatMapper extends BaseMapper<Mat> {
- List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx);
+ List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx, @Param("specs") Object specs, @Param("model") Object model);
Mat selectByMatnr(@Param("matnr")String matnr);
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index 3b4b655..faa1370 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -6,7 +6,7 @@
public interface MatService extends IService<Mat> {
- Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
+ Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs, Object model);
Mat selectByMatnr(String matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index 8abf584..0165023 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -11,8 +11,8 @@
public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
@Override
- public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx) {
- return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
+ public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs, Object model) {
+ return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx, specs, model));
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 3f6482e..945997c 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -127,7 +127,7 @@
//鐗╂枡鐘舵�� FUseOrgId .FNumber
FDocumentStatus="C";
jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(time)+"' and FDocumentStatus='"+FDocumentStatus+"' and FUseOrgId .FNumber='201'");
- jsonObject.put("FieldKeys", "FName,FNumber,FCreateDate,FSpecification,FDocumentStatus");
+ jsonObject.put("FieldKeys", "FName,FNumber,FCreateDate,FSpecification,FDocumentStatus,FTuhao");
// FName : 鐗╂枡鍚嶇О 锛�
// FNumber 锛氱墿鏂欑紪鍙凤紱
// FCreateDate 锛氱墿鏂欏垱寤烘椂闂达紱
@@ -181,6 +181,7 @@
mat.setMatnr(jsonArray.get(1).toString());
mat.setMaktx(jsonArray.get(0).toString());
mat.setSpecs(jsonArray.get(3).toString());//瑙勬牸
+ mat.setModel(jsonArray.get(5).toString());//鍥惧彿
mat.setTagId(20L);
//瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 5f89c82..a244da7 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -68,6 +68,12 @@
<if test="maktx != null and maktx != ''">
and mm.maktx like concat('%',#{maktx},'%')
</if>
+ <if test="specs != null and specs != ''">
+ and mm.specs like concat('%',#{specs},'%')
+ </if>
+ <if test="model != null and model != ''">
+ and mm.model like concat('%',#{model},'%')
+ </if>
ORDER BY mm.create_time DESC
</select>
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 7eb0f43..d94cb62 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -15,19 +15,13 @@
and batch like '%' + #{batch} + '%'
</if>
<if test="maktx!=null and maktx!='' ">
- and (maktx like '%' + #{maktx} + '%'
- or matnr like '%' + #{maktx} + '%'
- or lgnum like '%' + #{maktx} + '%'
- or tbnum like '%' + #{maktx} + '%'
- or tbpos like '%' + #{maktx} + '%'
- or zmatid like '%' + #{maktx} + '%'
- or maktx like '%' + #{maktx} + '%'
- or werks like '%' + #{maktx} + '%'
- or anfme like '%' + #{maktx} + '%'
- or altme like '%' + #{maktx} + '%'
- or zpallet like '%' + #{maktx} + '%'
- or bname like '%' + #{maktx} + '%'
- )
+ and maktx like '%' + #{maktx} + '%'
+ </if>
+ <if test="specs!=null and specs!='' ">
+ and specs like '%' + #{specs} + '%'
+ </if>
+ <if test="model!=null and model!='' ">
+ and model like '%' + #{model} + '%'
</if>
<if test="begin_date!=null and begin_date!='' ">
<![CDATA[
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 680fd03..1a585ac 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -188,7 +188,7 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+ ,{field: 'model', align: 'center',title: '鍥惧彿', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index ec329f9..ccf3fa2 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -3,6 +3,7 @@
var cols = [
{field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'model', align: 'center',title: '鍥惧彿'}
];
cols.push.apply(cols, detlCols);
return cols;
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index c8b06bf..bc8ecab 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -5,6 +5,7 @@
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ ,{field: 'model', align: 'center',title: '鍥惧彿'}
];
cols.push.apply(cols, detlCols);
return cols;
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index f3fa219..f774c36 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -97,6 +97,18 @@
<input name="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">瑙勬牸:</label>
+ <div class="layui-input-inline">
+ <input name="specs" class="layui-input" placeholder="杈撳叆瑙勬牸"/>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍥惧彿:</label>
+ <div class="layui-input-inline">
+ <input name="model" class="layui-input" placeholder="杈撳叆鍥惧彿"/>
+ </div>
+ </div>
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 2cfbe1e..19a0e46 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -39,6 +39,21 @@
<input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="model" 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>
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index dbd4ae4..ace1fba 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -39,6 +39,21 @@
<input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="model" 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>
--
Gitblit v1.9.1