| src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/zy/cloud/wms/manager/entity/Receive.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/js/receiveDetl/receiveDetl.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/receiveDetl/receiveDetl.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
@@ -141,7 +141,7 @@ /** * 控管与数据初始化 */ if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getBatch(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){ if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){ return R.error("输入数据有误,请重新输入"); } Date date = new Date(); @@ -241,7 +241,7 @@ .eq("matnr", receiveDetl.getMatnr()) .eq("batch", receiveDetl.getBatch()) .eq("io_type", 1)); if (!Cools.isEmpty(receiveLogs)) { if (Cools.isEmpty(receiveLogs)) { return R.error("找不到入库记录"); } for (ReceiveLog receiveLog : receiveLogs) { src/main/java/zy/cloud/wms/manager/entity/Receive.java
@@ -7,6 +7,7 @@ import com.core.common.Cools; import com.core.common.SpringUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import zy.cloud.wms.manager.service.CstmrService; import zy.cloud.wms.manager.service.DocTypeService; import zy.cloud.wms.manager.service.ItemService; @@ -20,6 +21,7 @@ import java.text.SimpleDateFormat; import java.util.Date; @Data @TableName("man_receive") public class Receive implements Serializable {
@@ -1,5 +1,6 @@ package zy.cloud.wms.manager.entity; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotations.TableField; @@ -26,6 +27,7 @@ import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty; import com.core.common.SpringUtils; import zy.cloud.wms.manager.service.ReceiveService; import zy.cloud.wms.system.service.UserService; import zy.cloud.wms.system.entity.User; import java.text.SimpleDateFormat; @@ -234,6 +236,17 @@ // null // 备注 // ); public String getOrderId$(){ ReceiveService receiveService = SpringUtils.getBean(ReceiveService.class); Receive receive = receiveService.selectOne(new EntityWrapper<Receive>() .eq("id", orderId)); if (!Cools.isEmpty(receive)) { return receive.getOrderNo(); }else { return orderId + ""; } } public Long getId() { return id; } @@ -254,14 +267,14 @@ return orderId; } public String getOrderId$(){ OrderService service = SpringUtils.getBean(OrderService.class); Order order = service.selectById(this.orderId); if (!Cools.isEmpty(order)){ return String.valueOf(order.getId()); } return null; } // public String getOrderId$(){ // OrderService service = SpringUtils.getBean(OrderService.class); // Order order = service.selectById(this.orderId); // if (!Cools.isEmpty(order)){ // return String.valueOf(order.getId()); // } // return null; // } public String getState$(){ if (this.inQty == 0){ src/main/webapp/static/js/receiveDetl/receiveDetl.js
@@ -25,7 +25,7 @@ {type: 'checkbox'} ,{field: 'id', align: 'center',title: 'ID', hide:true} ,{field: 'hostId', align: 'center',title: '', hide:true} ,{field: 'orderId$', align: 'center',title: '订单内码', width: 100} ,{field: 'orderId$', align: 'center',title: '订单', width: 185} ,{field: 'anfme', align: 'center',title: '应入库量', width: 100} ,{field: 'inQty', align: 'center',title: '已入库量', width: 100} ,{field: 'matnr', align: 'center',title: '商品编码'} src/main/webapp/views/receiveDetl/receiveDetl.html
@@ -10,6 +10,7 @@ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> <link rel="stylesheet" href="../../static/css/cool.css" media="all"> <link rel="stylesheet" href="../../static/css/common.css" media="all"> </head> <body> @@ -97,6 +98,16 @@ <div class="layui-col-md6"> <div class="layui-form-item"> <label class="layui-form-label"> 批号: </label> <div class="layui-input-block"> <input type="text" class="layui-input" name="batch" placeholder="该订单无批号" disabled> </div> </div> </div> <div class="layui-col-md6"> <div class="layui-form-item"> <label class="layui-form-label"> 应入库量: </label> <div class="layui-input-block"> @@ -104,29 +115,20 @@ </div> </div> </div> <div class="layui-col-md6"> <div class="layui-form-item"> <label class="layui-form-label"> 已入库量: <label class="layui-form-label layui-form-required" > 本次入库: </label> <div class="layui-input-block"> <input class="layui-input" name="inQty" disabled> <input type="number" class="layui-input" name="remain" placeholder="请输入" lay-vertype="tips" required> </div> </div> </div> <div class="layui-col-md6"> <div class="layui-form-item"> <label class="layui-form-label"> 本次入库量: </label> <div class="layui-input-block"> <input type="number" class="layui-input" name="remain" placeholder="请输入" required> </div> </div> </div> <div class="layui-col-md6"> <div class="layui-form-item"> <label class="layui-form-label"> <label class="layui-form-label layui-form-required"> 入库位置: </label> <div class="layui-input-block"> @@ -135,17 +137,20 @@ </div> </div> </div> <div class="layui-col-md6"> <div class="layui-form-item"> <label class="layui-form-label"> 批号: 已入库量: <span> </span> </label> <div class="layui-input-block"> <input type="text" class="layui-input" name="batch" placeholder="请输入" required> <input class="layui-input" name="inQty" disabled> </div> </div> </div> <hr class="layui-bg-gray"> <div class="layui-form-item text-right"> <!-- <button class="layui-btn" lay-filter="recommendIn" lay-submit="">自动入库</button>-->
