修改物料库存状态显示

mahuandong
1 parent 714a6144
Showing 2 changed files with 12 additions and 4 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/config/material/material.html
@@ -148,7 +148,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 ReceiptContainerHeader record =new ReceiptContainerHeader();
                 record.setStatus((short)0);
                 record.setId(taskHeader.getAllocationHeadId());
-                if (receiptContainerHeaderService.updateById(record)){throw new ServiceException("回滚组盘明细失败");}
+                if (!receiptContainerHeaderService.updateById(record)){throw new ServiceException("回滚组盘明细失败");}
             }
             //根据任务类型来更新货箱状态
             //修改关联的货箱状态
@@ -1174,8 +1174,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                             if (!receiptDetailService.updateById(detail)){
                                 throw new ServiceException("更新入库单详情失败");
                             }
-                            //更新头表状态
-                            receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
                         }
                     }
                 } else {
@@ -162,7 +162,17 @@
 				},
 				{
 					field : 'autoGenSerialNum',
-					title : '自动生成序列号' ,
+					title : '自动生成序列号',
+					align: 'center',
+					formatter: function(value, row, index) {
+						var actions = [];
+						if (value == 0){
+							actions.push("<span class='badge badge-primary'>自动生成</span>");
+						} else {
+							actions.push("<span class='badge badge-primary'>不自动生成</span>");
+						}
+						return actions.join('');
+					}
 				},
 				{
 					field : 'autoGenSerialNumFormat',