From dcd7fcf596005d0c7cf66558bee97edf6c3b03a0 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期四, 10 三月 2022 18:12:09 +0800
Subject: [PATCH] #物料状态维护
---
src/main/java/com/zy/asrs/entity/LocNormalLog.java | 4 +
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 9 +-
src/main/java/com/zy/asrs/controller/LocNormalController.java | 13 ++++
src/main/webapp/static/js/locNormal/locNormal.js | 60 ++++++++++++++++++++
src/main/java/com/zy/common/service/erp/ErpService.java | 1
src/main/java/com/zy/asrs/mapper/LocNormalMapper.java | 5 +
src/main/resources/mapper/LocNormalMapper.xml | 28 +++++++++
src/main/java/com/zy/asrs/entity/LocNormal.java | 4 +
src/main/webapp/views/locNormal/locNormal.html | 12 ++++
src/main/resources/mapper/LocNormalLogMapper.xml | 1
src/main/java/com/zy/asrs/service/LocNormalService.java | 7 ++
11 files changed, 139 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 3c48439..e359b57 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -12,6 +12,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.sun.org.apache.bcel.internal.generic.NEW;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocNormal;
import com.zy.asrs.entity.LocNormalLog;
import com.zy.asrs.entity.LocNormalReport;
@@ -158,6 +159,18 @@
locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
+ /**
+ * 鎵归噺淇敼鐗╂枡鐘舵��
+ * @return
+ */
+ @RequestMapping(value = "/locNormal/getAllLocDetlData")
+ @ManagerAuth(memo = "鎵归噺淇敼鐗╂枡鐘舵��")
+ public R getAllLocDetlData(@RequestBody JSONObject param) {
+ List<LocNormal> list = JSONObject.parseArray(param.getJSONArray("list").toJSONString(), LocNormal.class);
+ Integer result = locNormalService.getAllLocDetlData(list);
+ return R.ok().add(result);
+ }
+
@RequestMapping(value = "/locNormal/removeLoc/auth")
@ManagerAuth
public void removeLoc(LocNormal param) {
diff --git a/src/main/java/com/zy/asrs/entity/LocNormal.java b/src/main/java/com/zy/asrs/entity/LocNormal.java
index 76a6d42..a2d8673 100644
--- a/src/main/java/com/zy/asrs/entity/LocNormal.java
+++ b/src/main/java/com/zy/asrs/entity/LocNormal.java
@@ -97,6 +97,10 @@
@TableField(exist = false)
private BigDecimal anfmeOut;
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ @TableField("mat_status")
+ private String matStatus;
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
diff --git a/src/main/java/com/zy/asrs/entity/LocNormalLog.java b/src/main/java/com/zy/asrs/entity/LocNormalLog.java
index acea73a..4d286b3 100644
--- a/src/main/java/com/zy/asrs/entity/LocNormalLog.java
+++ b/src/main/java/com/zy/asrs/entity/LocNormalLog.java
@@ -71,6 +71,10 @@
@TableField("io_type")
private Integer ioType;
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ @TableField("mat_status")
+ private String matStatus;
+
public String getCreateUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createUser);
diff --git a/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java b/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
index 4c05395..02c4b2d 100644
--- a/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocNormal;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -24,6 +25,10 @@
public void removeLocNormal(@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime, @Param("id") Integer id);
+ List<LocNormal> getAllLocDetlData(@Param("supplier") String supplier, @Param("matnr") String matnr);
+
+ Integer updateMatStatus(List<LocNormal> list);
+
public Integer pdaLocNormalIn(List<LocNormal> list);
public Integer pdaLocNormalUpdate(List<LocNormal> list);
diff --git a/src/main/java/com/zy/asrs/service/LocNormalService.java b/src/main/java/com/zy/asrs/service/LocNormalService.java
index d476603..958cf45 100644
--- a/src/main/java/com/zy/asrs/service/LocNormalService.java
+++ b/src/main/java/com/zy/asrs/service/LocNormalService.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocNormal;
import io.swagger.models.auth.In;
@@ -19,6 +20,12 @@
public void locNormalIn(List<LocNormal> list);
+ /**
+ * 鎵归噺淇敼鐗╂枡鐘舵��
+ * @return
+ */
+ public Integer getAllLocDetlData(List<LocNormal> list);
+
public void locNormalInSource(List<LocNormal> list);
public void pdaLocNormalIn(List<LocNormal> list);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 20eacbe..956cba2 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -6,10 +6,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocNormalLog;
-import com.zy.asrs.entity.LocNormal;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WaitPakinLog;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.ERPselectParam;
import com.zy.asrs.mapper.LocNormalMapper;
import com.zy.asrs.mapper.OutStockMapper;
@@ -546,4 +543,8 @@
}
return locNormalResult;
}
+
+ public Integer getAllLocDetlData(List<LocNormal> list) {
+ return baseMapper.updateMatStatus(list);
+ }
}
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 9e7a840..bdb282e 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -458,7 +458,6 @@
if(select1.size()<1){
if (!completeCPakOut(FBillNo) ) {
log.error("{}鍑哄簱鍗曟爣璁板畬鎴愬け璐�", FBillNo);
-
}
int updateCount = jdbcTemplate.update("update OutStockbill set Fflag_finish=1 where FBillNo='" + FBillNo + "'");
if(updateCount<=0){
diff --git a/src/main/resources/mapper/LocNormalLogMapper.xml b/src/main/resources/mapper/LocNormalLogMapper.xml
index 5ffa7d2..949cfd2 100644
--- a/src/main/resources/mapper/LocNormalLogMapper.xml
+++ b/src/main/resources/mapper/LocNormalLogMapper.xml
@@ -19,6 +19,7 @@
<result column="create_user" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="io_type" property="ioType"/>
+ <result column="mat_status" property="matStatus"/>
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index fccd71f..f8dcebe 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -21,6 +21,7 @@
<result column="appe_user" property="appeUser"/>
<result column="appe_time" property="appeTime"/>
<result column="state" property="state"/>
+ <result column="mat_status" property="matStatus"/>
</resultMap>
<select id="getLocNormalData" resultMap="BaseResultMap">
@@ -129,4 +130,31 @@
and mnemonic = #{mnemonic}
</if>
</select>
+
+ <select id="getAllLocDetlData" resultMap="BaseResultMap">
+ select * from asr_loc_normal where 1 = 1
+ <if test="supplier!=null and supplier!='' ">
+ and supplier = #{supplier,jdbcType=VARCHAR}
+ </if>
+ <if test="matnr!=null and matnr!='' ">
+ and matnr = #{matnr,jdbcType=VARCHAR}
+ </if>
+ </select>
+
+ <update id="updateMatStatus">
+ BEGIN
+ <foreach collection="list" item="item" index="index">
+ update dbo.asr_loc_normal
+ set mat_status = #{item.matStatus,jdbcType=VARCHAR}
+ where 1 = 1
+ <if test="item.supplier!=null and item.supplier!='' ">
+ and supplier = #{item.supplier,jdbcType=VARCHAR}
+ </if>
+ <if test="item.matnr!=null and item.matnr!='' ">
+ and matnr = #{item.matnr,jdbcType=VARCHAR}
+ </if>
+ </foreach>
+ END;
+ </update>
+
</mapper>
diff --git a/src/main/webapp/static/js/locNormal/locNormal.js b/src/main/webapp/static/js/locNormal/locNormal.js
index fa7b34f..6746562 100644
--- a/src/main/webapp/static/js/locNormal/locNormal.js
+++ b/src/main/webapp/static/js/locNormal/locNormal.js
@@ -5,12 +5,14 @@
function getCol() {
var cols = [];
cols.push(
+ {type: 'checkbox', fixed: 'left'},
{field: 'anfme', align: 'center', title: '鏁伴噺', sort: true, edit: 'text'}
)
cols.push.apply(cols, locNormalCols);
cols.push(
{field: 'warehouse$', align: 'center', title: '搴撳尯'}
, {field: 'state$', align: 'center', title: '鍑哄叆搴撶姸鎬�', templet: '#locNormalState'}
+ ,{field: 'matStatus', align: 'center',title: '鐗╂枡鐘舵��', width: 100, templet: '#matStatus'}
, {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
, {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true}
, {field: 'appeTime$', align: 'center', title: '鍒涘缓鏃堕棿', hide: true}
@@ -396,4 +398,62 @@
});
}
+var matStatusConfirm;
+function showMatStatus1() {
+ var layer = layui.layer;
+ var table = layui.table;
+ // 鑾峰彇閫変腑琛�
+ var checkStatus = table.checkStatus('locNormal');
+ // 閫夋嫨琛屾暟鎹�
+ var checkData = checkStatus.data;
+ if (checkData.length == 0) {
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ matStatusConfirm = layer.open({
+ type: 2,
+ title: '閫夋嫨鐗╂枡鐘舵��',
+ area: ['300px', '175px'],
+ content: '../pakStore/matStatus.html',
+ btn: ['纭畾'],
+ success: function (layero, index) {
+ // 鎴愬姛鎵撳紑寮圭獥
+ // tableReload(false);
+ },
+ yes: function (index, layero) {
+ // 瀛愰〉闈�
+ var matStatus = layero.find('iframe')[0].contentDocument;
+ // 瀛愰〉闈㈤�夋嫨鏁版嵁鐩戞帶
+ var forms = matStatus.forms;
+ var cho = forms[0][0].value;
+ // 鍏ュ弬鎷兼帴
+ if (checkData && checkData.length > 0) {
+ checkData.map(function (item) {
+ item.matStatus = cho;
+ });
+ }
+ param = {
+ list: checkData,
+ };
+ // 鏇存柊鐗╂枡鐘舵��
+ console.log('閫夋嫨鏁版嵁', checkData);
+ $.ajax({
+ url: baseUrl+"/locNormal/getAllLocDetlData",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ console.log('杩斿洖鍊�', res);
+ // 鍏抽棴寮圭獥
+ layer.close(index);
+ // 琛ㄦ牸鏁版嵁閲嶇疆
+ tableReload(false);
+ }
+ });
+ }
+ });
+}
+
diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
index 02f4dfd..9e8002f 100644
--- a/src/main/webapp/views/locNormal/locNormal.html
+++ b/src/main/webapp/views/locNormal/locNormal.html
@@ -122,6 +122,7 @@
</button>
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆
</button>
+ <button id="updateMatStatus" class="layui-btn layui-btn-normal" lay-submit onclick="showMatStatus1()">鐗╂枡鐘舵�佺淮鎶�</button>
</div>
</div>
@@ -178,6 +179,17 @@
<button class="layui-btn layui-btn-xs layui-btn-danger btn-remove" lay-event="removeLocNormal">绉婚櫎</button>
</script>
+ <script type="text/html" id="matStatus">
+ {{# if(d.matStatus === '1'){ }}
+ <span style="color: green">鑹搧</span>
+ {{# } else if(d.matStatus === '2'){ }}
+ <span style="color: red">涓嶈壇鍝�</span>
+ {{# } else if(d.matStatus === '3'){ }}
+ <span style="color: blue">鐭</span>
+ {{# } else { }}
+ {{# } }}
+ </script>
+
</div>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1