| src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/LocDetlMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/js/pakStore/stockAdjust.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/pakStore/matSupplier.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/pakStore/stockAdjust.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -32,6 +32,7 @@ // 产品号 private String matNo; private String supplier; // 变更数量 private Double count; @@ -43,6 +44,14 @@ this.matNo = matNo; } public String getSupplier() { return supplier; } public void setSupplier(String supplier) { this.supplier = supplier; } public Double getCount() { return count; } src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -652,6 +652,7 @@ LocDetl sqlParam = new LocDetl(); sqlParam.setLocNo(locMast.getLocNo()); sqlParam.setMatNo(adjust.getMatNo()); sqlParam.setSupplier(adjust.getSupplier()); LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam)); // 保存新库存明细 if (Cools.isEmpty(one)) { @@ -663,6 +664,15 @@ locDetl.setLocNo(locMast.getLocNo()); locDetl.setQty(adjust.getCount()); // 数量 VersionUtils.setLocDetl(locDetl, matCode); // 版本控制 if (Cools.isEmpty(adjust.getSupplier())){ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); locDetl.setSupplier(sdf.format(new Date())); }else { locDetl.setSupplier(adjust.getSupplier()); } locDetl.setModiUser(userId); // 操作人员信息 locDetl.setModiTime(new Date()); locDetl.setAppeUser(userId); @@ -690,11 +700,13 @@ } else { LocDetl sqlParam1 = new LocDetl(); sqlParam1.setQty(adjust.getCount()); sqlParam1.setSupplier(adjust.getSupplier()); sqlParam1.setModiTime(new Date()); sqlParam1.setModiUser(userId); if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>() .eq("loc_no", locMast.getLocNo()) .eq("mat_no", adjust.getMatNo()))) { .eq("mat_no", adjust.getMatNo()) .eq("supplier",adjust.getSupplier()))) { throw new CoolException("修改库存明细失败"); } } src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -3,10 +3,9 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.MatCode; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.MatCodeCountDto; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.mapper.WrkDetlMapper; import com.zy.asrs.service.MatCodeService; import com.zy.asrs.service.WrkDetlService; @@ -15,7 +14,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -47,7 +45,7 @@ wrkDetl.setSeqNo((null != dto.getSeqNo()) ? dto.getSeqNo() : 0); if (Cools.isEmpty(dto.getSupplier())){ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); dto.setSupplier(sdf.format(new Date())); wrkDetl.setSupplier(sdf.format(new Date())); }else { wrkDetl.setSupplier(dto.getSupplier()); } src/main/resources/mapper/LocDetlMapper.xml
@@ -58,6 +58,7 @@ and b.loc_sts = 'F' <include refid="stockOutCondition"></include> ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) order by supplier,modi_time,loc_no </select> <select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer"> src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -9,7 +9,7 @@ ]; arrRemove(detlCols, "field", "anfme") cols.push.apply(cols, detlCols); cols.push({fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:80}) cols.push({fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}) return cols; } @@ -35,7 +35,7 @@ // 页面修改 table.on('edit(chooseData)', function (obj) { updateMatCodeData(obj.data.matNo, Number(obj.value)); updateMatCodeData(obj.data.matNo,obj.data.supplier, Number(obj.value)); }); // 监听头工具栏事件 @@ -97,11 +97,40 @@ switch (obj.event) { case 'remove': for (var i = matCodeData.length - 1; i >= 0; i--) { if (matCodeData[i].matNo === data.matNo) { if (matCodeData[i].matNo === data.matNo && matCodeData[i].supplier === data.supplier) { matCodeData.splice(i, 1); } } tableIns.reload({data: matCodeData,done:function (res) {limit();}}); break; case 'supplier': var supplierLayer = layer.open({ type: 2, title: '批号', maxmin: true, area: ['400px', '215px'], shadeClose: false, content: 'matSupplier.html', btn: ['保存', '取消'], style: 'text-algin: center', yes: function(index, layero){ var supplier = layer.getChildFrame('body', index).find("#supplier")[0].value; matCodeData.map(function (item) { if (item.matNo === data.matNo && item.supplier === data.supplier) { item.supplier = supplier; } }); layer.close(index); // // 重置表格数据 tableIns.reload({data: matCodeData,done:function (res) { limit(); }}); }, success: function(layero, index){ var iframeWin = window[layero.find('iframe')[0]['name']];//得到iframe页的窗口对象 iframeWin.setMatSupplier(data.supplier); } }); break; } }); @@ -177,13 +206,13 @@ } } function updateMatCodeData(matNo, count) { function updateMatCodeData(matNo, supplier, count) { if (isNaN(count)) { layer.msg("请输入数字"); } else { if (count >= 0) { for (var i=0;i<matCodeData.length;i++){ if (matCodeData[i]["matNo"] === matNo){ if (matCodeData[i]["matNo"] === matNo && matCodeData[i]["supplier"] === supplier){ matCodeData[i]["count"] = count; } } @@ -234,7 +263,8 @@ let pass = false; for (var j=0;j<matCodeData.length;j++){ zpa=matCodeData[0].zpallet if (data[i].matNo === matCodeData[j].matNo) { if (data[i].matNo === matCodeData[j].matNo && data[i].supplier === matCodeData[j].supplier) { // console.log(data[i].supplier + '@@' +matCodeData[j].supplier) pass = true; break; } @@ -252,6 +282,7 @@ size: data[i].size, unit: data[i].unit, zpallet:zpa, supplier:'', qty:0 }) } src/main/webapp/views/pakStore/matSupplier.html
New file @@ -0,0 +1,23 @@ <!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> <title>批号</title> <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> <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/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/handlebars/handlebars-v4.5.3.js"></script> </head> <body> <div style="text-align: center; padding: 5px"> <textarea rows="6" style="width: 95%; resize: none" id="supplier" type="text"></textarea> </div> </body> <script> function setMatSupplier(val) { $("#supplier").val(val ? val : ''); } </script> </html> src/main/webapp/views/pakStore/stockAdjust.html
@@ -114,6 +114,7 @@ <!-- 行 --> <script type="text/html" id="operate"> {{# if(d.removeBtn){ }} <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="supplier">批号</a> <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">移除</a> {{# } }} </script>
