完善关联请购单中的数量计算逻辑

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java

@@ -62,6 +62,8 @@ public class DepotHead {
 
     private String linkNumber;
 
+    private String linkApply;
+
     private Long tenantId;
 
     private String deleteFlag;
@@ -298,6 +300,14 @@ public class DepotHead {
         this.linkNumber = linkNumber == null ? null : linkNumber.trim();
     }
 
+    public String getLinkApply() {
+        return linkApply;
+    }
+
+    public void setLinkApply(String linkApply) {
+        this.linkApply = linkApply == null ? null : linkApply.trim();
+    }
+
     public Long getTenantId() {
         return tenantId;
     }

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java

@@ -1996,6 +1996,76 @@ public class DepotHeadExample {
             return (Criteria) this;
         }
 
+        public Criteria andLinkApplyIsNull() {
+            addCriterion("link_apply is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyIsNotNull() {
+            addCriterion("link_apply is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyEqualTo(String value) {
+            addCriterion("link_apply =", value, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyNotEqualTo(String value) {
+            addCriterion("link_apply <>", value, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyGreaterThan(String value) {
+            addCriterion("link_apply >", value, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyGreaterThanOrEqualTo(String value) {
+            addCriterion("link_apply >=", value, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyLessThan(String value) {
+            addCriterion("link_apply <", value, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyLessThanOrEqualTo(String value) {
+            addCriterion("link_apply <=", value, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyLike(String value) {
+            addCriterion("link_apply like", value, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyNotLike(String value) {
+            addCriterion("link_apply not like", value, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyIn(List<String> values) {
+            addCriterion("link_apply in", values, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyNotIn(List<String> values) {
+            addCriterion("link_apply not in", values, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyBetween(String value1, String value2) {
+            addCriterion("link_apply between", value1, value2, "linkApply");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkApplyNotBetween(String value1, String value2) {
+            addCriterion("link_apply not between", value1, value2, "linkApply");
+            return (Criteria) this;
+        }
+
         public Criteria andTenantIdIsNull() {
             addCriterion("tenant_id is null");
             return (Criteria) this;

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -211,13 +211,15 @@ public interface DepotItemMapperEx {
     BigDecimal getFinishNumber(
             @Param("meId") Long meId,
             @Param("linkId") Long linkId,
-            @Param("linkNumber") String linkNumber,
+            @Param("linkStr") String linkStr,
+            @Param("noType") String noType,
             @Param("goToType") String goToType);
 
     BigDecimal getRealFinishNumber(
             @Param("meId") Long meId,
             @Param("linkId") Long linkId,
-            @Param("linkNumber") String linkNumber,
+            @Param("linkStr") String linkStr,
+            @Param("linkType") String linkType,
             @Param("currentHeaderId") Long currentHeaderId,
             @Param("goToType") String goToType);
 
@@ -235,10 +237,11 @@ public interface DepotItemMapperEx {
             @Param("depotId") Long depotId);
 
     List<DepotItemVo4MaterialAndSum> getLinkBillDetailMaterialSum(
-            @Param("linkNumber") String linkNumber);
+            @Param("linkStr") String linkStr);
 
     List<DepotItemVo4MaterialAndSum> getBatchBillDetailMaterialSum(
-            @Param("linkNumber") String linkNumber,
+            @Param("linkStr") String linkStr,
+            @Param("linkType") String linkType,
             @Param("type") String type);
 
     Long getCountByMaterialAndBatchNumber(