diff --git a/src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java b/src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
index 717bb5e..5f40434 100644
--- a/src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
+++ b/src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
@@ -693,7 +693,7 @@ public class MesReceiptController extends BaseController {
/**
- * post调用E_Rd_In（MOM）其他入库成功接口
+ * post调用E_Rd_In（MOM）其他入库成功接口（盘点入库回传）
*/
//@ApiLogger(apiName = "post调用E_Rd_In（MOM）其他入库接口", from="ROBOT")
@PostMapping("/postOther_E_Rd_In")
@@ -709,7 +709,7 @@ public class MesReceiptController extends BaseController {
receiptHeader1.setLastUpdatedBy(receiptHeader.getLastUpdatedBy());
receiptHeader1.setWarehouse(receiptHeader.getWarehouse());
receiptHeader1.setDepCode(QuantityConstant.DEFAULT_DEPT);
- receiptHeader1.setStock(QuantityConstant.DEFAULT_STOCK);
+ receiptHeader1.setStock(receiptHeader.getWarehouse());
List<OtherReceiptDetail> list = new ArrayList<>();
for (ReceiptDetail receiptDetail : receiptDetails) {
@@ -725,14 +725,28 @@ public class MesReceiptController extends BaseController {
detail.setMaterialCode(receiptDetail.getMaterialCode());
detail.setTaskQty(receiptDetail.getTaskQty());
detail.setQty(receiptDetail.getQty());
- detail.setWarehouseCode(receiptDetail.getWarehouseCode());
+ detail.setWarehouseCode(receiptHeader.getWarehouse());
detail.setNotice(receiptDetail.getNoticeNo());
detail.setISUrgent(receiptDetail.getIsUrgent());
detail.setReceiptBarcode(receiptDetail.getReceiptBarcode());
detail.setWarehouse(receiptHeader.getWarehouse());
detail.setWarehouseName(receiptHeader.getWarehouseName());
- detail.setLastUpdatedBy(receiptDetail.getLastUpdatedBy());
- detail.setLastUpdatedByName(receiptDetail.getLastUpdatedByName());
+ String lastUpdatedBy = receiptDetail.getLastUpdatedBy();
+ if (StringUtils.isEmpty(lastUpdatedBy)) {
+ detail.setLastUpdatedBy("");
+ detail.setLastUpdatedByName("");
+ } else {
+ User user = userService.selectUserByEmail(lastUpdatedBy);
+ String loginName;
+ if (user == null) {
+ loginName = "";
+ } else {
+ loginName = user.getLoginName();
+ }
+ detail.setLastUpdatedBy(loginName);
+ detail.setLastUpdatedByName(lastUpdatedBy);
+ }
+
detail.setProductionWorker(receiptHeader.getProductionWorker());
detail.setProductionWorkerName(receiptHeader.getProductionWorkerName());
list.add(detail);
diff --git a/src/main/resources/templates/config/warehouse/warehouse.html b/src/main/resources/templates/config/warehouse/warehouse.html
index 2f34b91..73b8168 100644
--- a/src/main/resources/templates/config/warehouse/warehouse.html
+++ b/src/main/resources/templates/config/warehouse/warehouse.html
@@ -3,234 +3,239 @@
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="gray-bg">
- <div class="container-div">
- <div class="row">
- <div class="col-sm-12 select-info">
- <form id="warehouse-form">
- <div class="select-list">
- <ul>
- <li>
- 仓库编码：<input type="text" name="code"/>
- </li>
- <li>
- 名称：<input type="text" name="name"/>
- </li>
- <li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('warehouse-form')"><i class="fa fa-refresh"></i> 重置</a>
- <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="config:company:export"><i class="fa fa-download"></i> 导出</a>-->
- </li>
- </ul>
- </div>
- </form>
- </div>
- <div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="copy()" shiro:hasPermission="config:warehouse:copy">
- <i class="fa fa-files-o"></i>复制仓库</a>
- <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:warehouse:add">
- <i class="fa fa-plus"></i> 新增
- </a>
- <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:warehouse:remove">
- <i class="fa fa-trash-o"></i> 删除
- </a>-->
- </div>
+<div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 select-info">
+ <form id="warehouse-form">
+ <div class="select-list">
+ <ul>
+ <li>
+ 仓库编码：<input type="text" name="code"/>
+ </li>
+ <li>
+ 名称：<input type="text" name="name"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+ class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('warehouse-form')"><i
+ class="fa fa-refresh"></i> 重置</a>
+ <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="config:company:export"><i class="fa fa-download"></i> 导出</a>-->
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ <div class="btn-group hidden-xs" id="toolbar" role="group">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="copy()"
+ shiro:hasPermission="config:warehouse:copy">
+ <i class="fa fa-files-o"></i>复制仓库</a>
+ <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
+ shiro:hasPermission="config:warehouse:add">
+ <i class="fa fa-plus"></i> 新增
+ </a>
+ <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:warehouse:remove">
+ <i class="fa fa-trash-o"></i> 删除
+ </a>-->
+ </div>
- <div class="col-sm-12 select-info">
- <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
- </div>
- </div>
+ <div class="col-sm-12 select-info">
+ <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+ </div>
</div>
- <div th:include="include :: footer"></div>
- <script th:inline="javascript">
- var editFlag = [[${@permission.hasPermi('config:warehouse:edit')}]];
- var removeFlag = [[${@permission.hasPermi('config:warehouse:remove')}]];
- var prefix = ctx + "config/warehouse";
- var datas = [[${@dict.getType('sys_normal_disable')}]];
- $(function() {
- var options = {
- url: prefix + "/list",
- createUrl: prefix + "/add",
- updateUrl: prefix + "/edit/{code}",
- removeUrl: prefix + "/remove",
- modalName: "仓库",
- search: false,
- columns: [{
- checkbox: true
- },
- // {
- // field : 'code',
- // title : '仓库编码'
- // },
- {
- field : 'userDef1',
- title : '仓库编码',
- visible:true
- },
- {
- field : 'name',
- title : '名称'
- },
- {
- field : 'orgCode',
- title : '公司编码',
- visible:false
- },
- {
- field : 'address1',
- title : '地址'
- },
- {
- field : 'address2',
- title : '地址2' ,
- visible:false
- },
- {
- field : 'city',
- title : '城市'
- },
- {
- field : 'state',
- title : '省份' ,
- visible:true
- },
- {
- field : 'district',
- title : '区/县' ,
- visible:true
- },
- {
- field : 'country',
- title : '国家' ,
- visible:false
- },
- {
- field : 'postalCode',
- title : '邮编' ,
- visible:true
- },
- {
- field : 'attentionTo',
- title : '联系人'
- },
- {
- field : 'phoneNum',
- title : '联系电话'
- },
- {
- field : 'faxNum',
- title : '传真号' ,
- visible:false
- },
- {
- field : 'email',
- title : '邮件地址' ,
- visible:true
- },
- {
- field : 'hostCode',
- title : '上位系统',
- visible:false
- },
- {
- field : 'created',
- title : '创建时间'
- },
- {
- field : 'createdBy',
- title : '创建用户'
- },
- {
- field : 'lastUpdated',
- title : '更新时间'
- },
- {
- field : 'lastUpdatedBy',
- title : '更新用户'
- },
- {
- field : 'enable',
- title : '是否有效' ,
+</div>
+<div th:include="include :: footer"></div>
+<script th:inline="javascript">
+ var editFlag = [[${@permission.hasPermi('config:warehouse:edit')}]];
+ var removeFlag = [[${@permission.hasPermi('config:warehouse:remove')}]];
+ var prefix = ctx + "config/warehouse";
+ var datas = [[${@dict.getType('sys_normal_disable')}]];
+ $(function () {
+ var options = {
+ url: prefix + "/list",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{code}",
+ removeUrl: prefix + "/remove",
+ modalName: "仓库",
+ search: false,
+ columns: [{
+ checkbox: true
+ },
+ // {
+ // field : 'code',
+ // title : '仓库编码'
+ // },
+ {
+ field: 'userDef1',
+ title: '仓库编码',
+ visible: false
+ },
+ {
+ field: 'name',
+ title: '名称'
+ },
+ {
+ field: 'orgCode',
+ title: '公司编码',
+ visible: false
+ },
+ {
+ field: 'address1',
+ title: '地址'
+ },
+ {
+ field: 'address2',
+ title: '地址2',
+ visible: false
+ },
+ {
+ field: 'city',
+ title: '城市'
+ },
+ {
+ field: 'state',
+ title: '省份',
+ visible: true
+ },
+ {
+ field: 'district',
+ title: '区/县',
+ visible: true
+ },
+ {
+ field: 'country',
+ title: '国家',
+ visible: false
+ },
+ {
+ field: 'postalCode',
+ title: '邮编',
+ visible: true
+ },
+ {
+ field: 'attentionTo',
+ title: '联系人'
+ },
+ {
+ field: 'phoneNum',
+ title: '联系电话'
+ },
+ {
+ field: 'faxNum',
+ title: '传真号',
+ visible: false
+ },
+ {
+ field: 'email',
+ title: '邮件地址',
+ visible: true
+ },
+ {
+ field: 'hostCode',
+ title: '上位系统',
+ visible: false
+ },
+ {
+ field: 'created',
+ title: '创建时间'
+ },
+ {
+ field: 'createdBy',
+ title: '创建用户'
+ },
+ {
+ field: 'lastUpdated',
+ title: '更新时间'
+ },
+ {
+ field: 'lastUpdatedBy',
+ title: '更新用户'
+ },
+ {
+ field: 'enable',
+ title: '是否有效',
align: 'center',
- formatter: function(value, row, index) {
+ formatter: function (value, row, index) {
return $.table.selectDictLabel(datas, value);
}
- },
- // {
- // field : 'deleted',
- // title : '是否删除'
- // },
+ },
+ // {
+ // field : 'deleted',
+ // title : '是否删除'
+ // },
- {
- field : 'userDef2',
- title : '自定义字段2' ,
- visible:false
- },
- {
- field : 'userDef3',
- title : '自定义字段3',
- visible:false
- },
- {
- field : 'userDef4',
- title : '自定义字段4',
- visible:false
- },
- {
- field : 'userDef5',
- title : '自定义字段5',
- visible:false
- },
- {
- field : 'userDef6',
- title : '自定义字段7',
- visible:false
- },
- {
- field : 'userDef7',
- title : '自定义字段7',
- visible:false
- },
- {
- field : 'userDef8',
- title : '自定义字段8',
- visible:false
- },
- {
- field : 'version',
- title : '数据版本',
- visible:false
- },
- {
- title: '操作',
- align: 'center',
- formatter: function(value, row, index) {
- var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick= edit(\''+row.code+'\')><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick=removes(\''+row.code+'\')><i class="fa fa-trash-o"></i>删除</a>');
- return actions.join('');
- }
- }]
- };
- $.table.init(options);
- });
+ {
+ field: 'userDef2',
+ title: '自定义字段2',
+ visible: false
+ },
+ {
+ field: 'userDef3',
+ title: '自定义字段3',
+ visible: false
+ },
+ {
+ field: 'userDef4',
+ title: '自定义字段4',
+ visible: false
+ },
+ {
+ field: 'userDef5',
+ title: '自定义字段5',
+ visible: false
+ },
+ {
+ field: 'userDef6',
+ title: '自定义字段7',
+ visible: false
+ },
+ {
+ field: 'userDef7',
+ title: '自定义字段7',
+ visible: false
+ },
+ {
+ field: 'userDef8',
+ title: '自定义字段8',
+ visible: false
+ },
+ {
+ field: 'version',
+ title: '数据版本',
+ visible: false
+ },
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function (value, row, index) {
+ var actions = [];
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick= edit(\'' + row.code + '\')><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick=removes(\'' + row.code + '\')><i class="fa fa-trash-o"></i>删除</a>');
+ return actions.join('');
+ }
+ }]
+ };
+ $.table.init(options);
+ });
- function edit(code) {
- var url = prefix + "/edit/"+code;
- $.modal.open("修改" + table.options.modalName, url);
- }
+ function edit(code) {
+ var url = prefix + "/edit/" + code;
+ $.modal.open("修改" + table.options.modalName, url);
+ }
+
+ // 删除信息
+ function removes(code) {
+ $.modal.confirm("确定删除该条" + table.options.modalName + "信息吗？", function () {
+ var url = $.common.isEmpty(code) ? table.options.removeUrl : table.options.removeUrl.replace("{code}", code);
+ var data = {"codes": code};
+ $.operate.submit(url, "post", "json", data);
+ });
+ }
- // 删除信息
- function removes(code) {
- $.modal.confirm("确定删除该条" + table.options.modalName + "信息吗？", function() {
- var url = $.common.isEmpty(code) ? table.options.removeUrl : table.options.removeUrl.replace("{code}", code);
- var data = { "codes": code };
- $.operate.submit(url, "post", "json", data);
- });
- }
- function copy() {
- var url = prefix+"/copy";
- $.modal.open("复制仓库" + table.options.modalName, url);
- }
- </script>
+ function copy() {
+ var url = prefix + "/copy";
+ $.modal.open("复制仓库" + table.options.modalName, url);
+ }
+</script>
</body>
</html>