feat:入库明细、库存明细、交易明细，新增是否自建单据字段和对应条件查询

易文鹏
1 parent 98891781
Showing 20 changed files with 127 additions and 11 deletions
src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/domain/ReceiptDetailHistory.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
src/main/resources/templates/config/material/material.html
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
@@ -164,7 +164,7 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
             if (material == null) {
                 return AjaxResult.error("物料不存在：" + materialCode);
             }
-            if (material.getSpec().equals("自建单据物料")) {
+            if (material.getSelfCreated()) {
                 isSelfCreated = 1;
             }
         }
@@ -233,7 +233,7 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
                 if (material == null) {
                     return AjaxResult.error("物料不存在：" + materialCode);
                 }
-                if (material.getSpec().equals("自建单据物料")) {
+                if (material.getSelfCreated()) {
                     isSelfCreated = 1;
                     break;
                 }
@@ -18,6 +18,7 @@ import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.common.JasperPrint.Print;
+import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
 import com.huaheng.pc.config.materialArea.domain.MaterialArea;
@@ -93,6 +94,8 @@ public class MaterialController extends BaseController {
                 .eq(StringUtils.isNotEmpty(material.getType()), Material::getType, material.getType())
                 .like(StringUtils.isNotNull(material.getSpec()) && StringUtils.isNotEmpty(material.getSpec()), Material::getSpec, material.getSpec())
                 .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(material.getSelfCreated() != null, Material::getSelfCreated, material.getSelfCreated())
+
                 .eq(Material::getDeleted, false);
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
@@ -19,6 +19,7 @@ import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.framework.web.service.ConfigService;
 import com.huaheng.pc.config.company.domain.Company;
 import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialServiceImpl;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
@@ -113,6 +114,7 @@ public class InventoryDetailController extends BaseController {
                 .like(StringUtils.isNotEmpty(inventoryDetail.getMaterialColor()), InventoryDetail::getMaterialColor, inventoryDetail.getMaterialColor()) //原仓库编码
                 .eq(StringUtils.isNotEmpty(inventoryDetail.getWarehouse()), InventoryDetail::getWarehouse, inventoryDetail.getWarehouse()) //原仓库编码
                 .like(StringUtils.isNotEmpty(inventoryDetail.getWarehouseName()), InventoryDetail::getWarehouseName, inventoryDetail.getWarehouseName()) //原仓库名称
+                .eq(inventoryDetail.getSelfCreated() != null, InventoryDetail::getSelfCreated, inventoryDetail.getSelfCreated())
                 //货主
                 .in(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()), InventoryDetail::getCompanyCode, inventoryDetail.getCompanyCode())
@@ -365,4 +365,10 @@ public class InventoryDetail implements Serializable {
     @TableField(value = "isMustFlatWarehouseMaterial")
     @ApiModelProperty(value = "是否必须平库物料，1为是")
     private Boolean isMustFlatWarehouseMaterial;
+
+    /**
+     * 1为自建单据
+     */
+    @TableField(value = "selfCreated")
+    private Boolean selfCreated;
 }
@@ -12,6 +12,7 @@ import com.huaheng.framework.web.controller.BaseController;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
@@ -89,6 +90,8 @@ public class InventoryTransactionController extends BaseController {
                 .eq(StringUtils.isNotEmpty(inventoryTransaction.getWarehouse()), InventoryTransaction::getWarehouse, inventoryTransaction.getWarehouse()) //原仓库编码
                 .like(StringUtils.isNotEmpty(inventoryTransaction.getWarehouseName()), InventoryTransaction::getWarehouseName, inventoryTransaction.getWarehouseName()) //原仓库名称
                 .eq(StringUtils.isNotEmpty(inventoryTransaction.getZoneCode()), InventoryTransaction::getZoneCode, inventoryTransaction.getZoneCode()) //库区
+                .eq(inventoryTransaction.getSelfCreated() != null, InventoryTransaction::getSelfCreated, inventoryTransaction.getSelfCreated())
+
                 //货主
                 .in(InventoryTransaction::getCompanyCode, ShiroUtils.getCompanyCodeList())
                 .orderByDesc(InventoryTransaction::getId);
@@ -358,4 +358,10 @@ public class InventoryTransaction implements Serializable {
     @TableField(value = "isMustFlatWarehouseMaterial")
     @ApiModelProperty(value = "是否必须平库物料，1为是")
     private Boolean isMustFlatWarehouseMaterial;
+
+    /**
+     * 1为自建单据
+     */
+    @TableField(value = "selfCreated")
+    private Boolean selfCreated;
 }
@@ -422,4 +422,10 @@ public class ReceiptDetail implements Serializable {
     @TableField(value = "remarks")
     @ApiModelProperty(value = "自建库备注")
     private String remarks;
+
+    /**
+     * 1为自建单据
+     */
+    @TableField(value = "selfCreated")
+    private Boolean selfCreated;
 }
@@ -120,6 +120,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         receiptDetail.setMaterialName(material.getName());
         receiptDetail.setMaterialSpec(material.getSpec());
         receiptDetail.setMaterialUnit(material.getUnit());
+        receiptDetail.setSelfCreated(true);
         receiptDetail.setCreatedBy(ShiroUtils.getName());
         receiptDetail.setLastUpdatedBy(ShiroUtils.getName());
@@ -14,6 +14,7 @@ import lombok.Data;
 @Data
 @TableName(value = "receipt_detail_history")
 public class ReceiptDetailHistory implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * 入库明细内部号
      */
@@ -424,5 +425,17 @@ public class ReceiptDetailHistory implements Serializable {
     @ApiModelProperty(value = "是否平库，1为平库")
     private Integer isFlatWarehouse;
-    private static final long serialVersionUID = 1L;
+    @TableField(value = "isMustFlatWarehouseMaterial")
+    @ApiModelProperty(value = "是否必须平库物料，1为是")
+    private Boolean isMustFlatWarehouseMaterial;
+    
+    @TableField(value = "remarks")
+    @ApiModelProperty(value = "自建库备注")
+    private String remarks;
+
+    /**
+     * 1为自建单据
+     */
+    @TableField(value = "selfCreated")
+    private Boolean selfCreated;
 }
@@ -201,6 +201,8 @@ public class ShipmentHeaderController extends BaseController {
                 .like(StringUtils.isNotEmpty(shipmentHeader.getProcessType()), ShipmentHeader::getProcessType, shipmentHeader.getProcessType())
                 .eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()), ShipmentHeader::getShipmentType, shipmentHeader.getShipmentType())
                 .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeader::getReferCode, shipmentHeader.getReferCode())
+                .like(StringUtils.isNotEmpty(shipmentHeader.getSuperiorCode()), ShipmentHeader::getSuperiorCode, shipmentHeader.getSuperiorCode())
+                .like(StringUtils.isNotEmpty(shipmentHeader.getSuperiorName()), ShipmentHeader::getSuperiorName, shipmentHeader.getSuperiorName())
                 .like(StringUtils.isNotEmpty(shipmentHeader.getTransferWarehouseName()), ShipmentHeader::getTransferWarehouseName, shipmentHeader.getTransferWarehouseName())
                 .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeader::getReferCodeType, shipmentHeader.getReferCodeType())
                 .between(StringUtils.isNotNull(startTime1), ShipmentHeader::getRequestedDeliveryDate, startTime1, endTime1)
@@ -152,6 +152,8 @@ public class ShipmentHeaderHistoryController extends BaseController {
                 .like(StringUtils.isNotEmpty(shipmentHeader.getProcessType()), ShipmentHeaderHistory::getProcessType, shipmentHeader.getProcessType())
                 .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeaderHistory::getReferCode, shipmentHeader.getReferCode())
                 .like(StringUtils.isNotEmpty(shipmentHeader.getTransferWarehouseName()), ShipmentHeaderHistory::getTransferWarehouseName, shipmentHeader.getTransferWarehouseName())
+                .like(StringUtils.isNotEmpty(shipmentHeader.getSuperiorCode()), ShipmentHeaderHistory::getSuperiorCode, shipmentHeader.getSuperiorCode())
+                .like(StringUtils.isNotEmpty(shipmentHeader.getSuperiorName()), ShipmentHeaderHistory::getSuperiorName, shipmentHeader.getSuperiorName())
                 .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeaderHistory::getReferCodeType, shipmentHeader.getReferCodeType())
                 .like(StringUtils.isNotEmpty(shipmentHeader.getOrigin()), ShipmentHeaderHistory::getOrigin, shipmentHeader.getOrigin())
                 .between(StringUtils.isNotNull(startTime1), ShipmentHeaderHistory::getRequestedDeliveryDate, startTime1, endTime1)
@@ -560,7 +560,9 @@ public class ReceiptTaskService {
             inventoryDetail.setIsFlatWarehouse(receiptDetail.getIsFlatWarehouse());
             inventoryDetail.setRemarks(receiptDetail.getRemarks());
             inventoryDetail.setIsMustFlatWarehouseMaterial(receiptDetail.getIsMustFlatWarehouseMaterial());
-
+            if (receiptDetail.getSelfCreated()) {
+                inventoryDetail.setSelfCreated(true);
+            }
             inventoryDetail.setReceiptCode(receiptHeader.getCode());
             inventoryDetail.setMaterialColor(receiptHeader.getMaterialColor());
             inventoryDetail.setWarehouse(receiptHeader.getWarehouse());
@@ -604,6 +606,9 @@ public class ReceiptTaskService {
         inventoryTransaction.setWarehouseName(receiptHeader.getWarehouseName());
         inventoryTransaction.setIsFlatWarehouse(receiptDetail.getIsFlatWarehouse());
         inventoryTransaction.setIsMustFlatWarehouseMaterial(receiptDetail.getIsMustFlatWarehouseMaterial());
+        if (receiptDetail.getSelfCreated()) {
+            inventoryDetail.setSelfCreated(true);
+        }
         TaskHeader taskHeader = taskHeaderService.getById(taskDetail.getTaskId());
         if (StringUtils.isNotEmpty(taskHeader.getLastUpdatedBy())) {
             inventoryTransaction.setCreatedBy(taskHeader.getLastUpdatedBy());
@@ -509,7 +509,7 @@ public class ShipmentTaskService {
             List<InventoryDetail> list = inventoryDetailService.list(new LambdaUpdateWrapper<InventoryDetail>().eq(InventoryDetail::getMaterialCode, materialCode));
             if (list.isEmpty()) {
                 Material material = materialService.getMaterialByCode(materialCode, "CS0001");
-                if (material != null) {
+                if (material != null && material.getSelfCreated()) {
                     materialService.removeById(material);
                 }
             }
@@ -18,10 +18,18 @@
                         <li>
                             规格：<input type="text" name="spec"/>
                         </li>
+
+                        <!--                        <li>-->
+                        <!--                            物料类别：<select name="type" th:with="type=${@materialType.list()}">-->
+                        <!--                            <option value="">所有</option>-->
+                        <!--                            <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option>-->
+                        <!--                        </select>-->
+                        <!--                        </li>-->
                         <li>
-                            物料类别：<select name="type" th:with="type=${@materialType.list()}">
-                            <option value="">所有</option>
-                            <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option>
+                            是否自建单据物料：<select id="selfCreated" name="selfCreated">
+                            <option value=''>所有</option>
+                            <option value="true">是</option>
+                            <option value="false">否</option>
                         </select>
                         </li>
                         <li class="time2">
@@ -79,6 +87,7 @@
     var datas = [[${@dict.getType('sys_normal_disable')}]];
     var mType = [[${@materialType.queryType()}]];
     var materialArea = [[${@materialArea.queryCode()}]];
+    var selfCreatedList = [[${@dict.getType('yes_or_no')}]];
     $(function () {
         var options = {
@@ -175,6 +184,14 @@
                     title: '供需政策'
                 },
                 {
+                    field: 'selfCreated',
+                    title: '自建单据物料',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(selfCreatedList, value);
+                    },
+                    align: 'center',
+                },
+                {
                     field: 'isBatch',
                     title: '是否批次'
                 },
@@ -49,6 +49,12 @@
                         原仓库编码：<input type="text" name="warehouseName"/>
                     </li>
                     <li>
+                        是否自建单据：<select id="selfCreated" name="selfCreated">
+                        <option value=''>所有</option>
+                        <option value="true">是</option>
+                        <option value="false">否</option>
+                    </select>
+                    <li>
                         库存状态：
                         <select name="inventorySts" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
                             <option value="">所有</option>
@@ -333,6 +339,14 @@
                         title: '通知单号',
                     },
                     {
+                        field: 'selfCreated',
+                        title: '自建单据',
+                        formatter: function (value, row, index) {
+                            return $.table.selectDictLabel(yes_or_no, value);
+                        },
+                        align: 'center',
+                    },
+                    {
                         field: 'remarks',
                         title: '备注',
                     },
@@ -74,9 +74,15 @@
                         <li>
                             合并前单号：<input type="text" name="recordCode"/>
                         </li>
-                        <!--                            <li>-->
-                        <!--                                操作人工号：<input type="text" name="createdByNo"/>-->
-                        <!--                            </li>-->
+                        <li>
+                            是否自建单据：<select id="selfCreated" name="selfCreated">
+                            <option value=''>所有</option>
+                            <option value="true">是</option>
+                            <option value="false">否</option>
+                        </select>
+                            <!--                            <li>-->
+                            <!--                                操作人工号：<input type="text" name="createdByNo"/>-->
+                            <!--                            </li>-->
                         <li class="time">
                             <label>创建时间： </label>
                             <input type="text" class="time-input" id="startTime" placeholder="开始时间"
@@ -240,6 +246,14 @@
                     title: '任务数量'
                 },
                 {
+                    field: 'selfCreated',
+                    title: '自建单据',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(yes_or_no, value);
+                    },
+                    align: 'center',
+                },
+                {
                     field: 'batch',
                     title: '批次',
                     visible: false
@@ -304,6 +304,7 @@
     var statusFirst = [[${statusFirst}]];
     var statusLast = [[${statusLast}]];
     var yes_or_no = [[${@dict.getType('yes_or_no')}]];
+
     //完成开始
     layui.use('laydate', function () {
         var laydate = layui.laydate;
@@ -711,6 +712,14 @@
                 title: '已收数量'
             },
             {
+                field: 'selfCreated',
+                title: '自建单据物料',
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(yes_or_no, value);
+                },
+                align: 'center',
+            },
+            {
                 field: 'isMustFlatWarehouseMaterial',
                 title: '必须平库物料',
                 formatter: function (value, row, index) {
@@ -731,6 +740,7 @@
                     }
                 }
             },
+
             {
                 field: 'referCode',
                 title: 'ERP单号',
@@ -76,6 +76,12 @@
                                         调入仓库名称：<input type="text" name="transferWarehouseName"/>
                                     </li>
                                     <li>
+                                        母件名称：<input type="text" name="superiorName"/>
+                                    </li>
+                                    <li>
+                                        母件编码：<input type="text" name="superiorCode"/>
+                                    </li>
+                                    <li>
                                         头 状 态：<select name="firstStatus"
                                                          th:with="firstStatus=${@dict.getType('shipmentHeaderStatus')}">
                                         <option value="">所有</option>
@@ -62,6 +62,12 @@
                                         调入仓库名称：<input type="text" name="transferWarehouseName"/>
                                     </li>
                                     <li>
+                                        母件名称：<input type="text" name="superiorName"/>
+                                    </li>
+                                    <li>
+                                        母件编码：<input type="text" name="superiorCode"/>
+                                    </li>
+                                    <li>
                                         头 状 态：<select name="firstStatus"
                                                          th:with="firstStatus=${@dict.getType('shipmentHeaderStatus')}">
                                         <option value="">所有</option>