出库单明细增加托盘号

易文鹏
1 parent 26b4b186
Showing 2 changed files with 20 additions and 11 deletions
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -89,7 +89,7 @@ public class InventoryDetailController extends BaseController
                 .eq(StringUtils.isNotEmpty(inventoryDetail.getInventorySts()),InventoryDetail::getInventorySts,inventoryDetail.getInventorySts())//库存状态
                 .eq(StringUtils.isNotEmpty(inventoryDetail.getBatch()),InventoryDetail::getBatch,inventoryDetail.getBatch())//批次
                 .eq(StringUtils.isNotEmpty(inventoryDetail.getProjectNo()),InventoryDetail::getProjectNo,inventoryDetail.getProjectNo())//项目号
-                .inSql(StringUtils.isNotEmpty(inventoryDetail.getSNNO()),InventoryDetail::getReceiptCode,"select receiptCode from receipt_detail where userDef8 = '"+inventoryDetail.getSNNO()+"'")//批号
+                .inSql(StringUtils.isNotEmpty(inventoryDetail.getSNNO()),InventoryDetail::getReceiptCode,"select receiptCode from receipt_detail where attribute4 = '"+inventoryDetail.getSNNO()+"'")//批号
                 .eq(StringUtils.isNotEmpty(inventoryDetail.getLot()),InventoryDetail::getLot,inventoryDetail.getLot())//批号
                 .eq(StringUtils.isNotEmpty(inventoryDetail.getReceiptCode()),InventoryDetail::getReceiptCode,inventoryDetail.getReceiptCode())//入库单编码
                 .eq(inventoryDetail.getReceiptDetailId() != null,InventoryDetail::getReceiptDetailId,inventoryDetail.getReceiptDetailId()) // 入库单明细ID
@@ -726,16 +726,25 @@
                     title: '通知单号',
                 },
                 {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        var actions = [];
-                        if (row.status < 100) {
-                            // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        }
-                        return actions.join('');
-                    }
-                }]
+                    field: 'receiptCode',
+                    title: '指定的入库单号',
+                },
+                {
+                    field: 'userDef3',
+                    title: '托盘号',
+                },
+                // {
+                //     title: '操作',
+                //     align: 'center',
+                //     formatter: function (value, row, index) {
+                //         var actions = [];
+                //         if (row.status < 100) {
+                //             // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                //         }
+                //         return actions.join('');
+                //     }
+                // }
+                ]
         }
     );