2024-06-28 调拨单和其他出库添加存货类型大类

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -92,7 +92,7 @@ public enum DdynamicEnum {
      * 用途：存货档案下拉框 (不默认状态)
      * 编写：
      */
-    INVENT_RECORD_BOX_BLOCK_ID("invent_record_box_block_id","inventCode","inventName","status","id","inventType","spec","material","unit", "length", "width", "thick","coefficient","HGPZ005.queryInventCodeBox"),
+    INVENT_RECORD_BOX_BLOCK_ID("invent_record_box_block_id","inventCode","inventName","status","id","inventType","spec","material","unit", "length", "width", "thick","inventTypeDetail","HGPZ005.queryInventCodeBox"),
 
     /**
      * 模块：存货档案
@@ -151,7 +151,7 @@ public enum DdynamicEnum {
      * 用途：调拨单下拉框
      * 编写：ly
      */
-    INVENT_CODE_BOX_BLOCK_ID("invent_code_box_block_id", "inventCode", "inventName","inventType", "specId","spec","length","width","thick","invQty","invUnitWeight","invWeight", "HGKC010.queryInventCodeBox"),
+    INVENT_CODE_BOX_BLOCK_ID("invent_code_box_block_id", "inventCode", "inventName","inventType", "specId","spec","length","width","thick","invQty","invUnitWeight","invWeight","inventTypeDetail", "HGKC010.queryInventCodeBox"),
 
     /**
      * 模块：从实时库存取规格信息

src/main/java/com/baosight/hggp/common/InventTypeDetailEnum.java

@@ -61,6 +61,10 @@ public enum InventTypeDetailEnum {
         return new Integer[]{COMPONENT.code,SEMI_FINISHED_PRODUCT.code};
     }
 
+    public static Integer[] getInentTypeThree(){
+        return new Integer[]{RAW.code,CONSUMABLE.code,CONSUMABLE.code,SEMI_FINISHED_PRODUCT.code};
+    }
+
     public static Integer[] getProdTypeFour(){
         return new Integer[]{COMPONENT.code,SEMI_FINISHED_PRODUCT.code,RAW.code,CONSUMABLE.code};
     }

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW001.xml

@@ -229,4 +229,17 @@
 		ID = #id#
 	</update>
 
+	<select id="getMaxAccountPeriod" resultClass="java.util.HashMap">
+		select
+			ACCOUNT_CODE as "accountCode",
+			COMPANY_CODE as "companyCode",
+			ACCOUNT_YEAR as "accountYear",
+			MAX(ACCOUNT_PERIOD) as "accountPeriod"
+		from ${hggpSchema}.HGCW001
+		where ACCOUNT_PERIOD_STATUS = '0'
+			<include refid="condition" />
+		group by
+			ACCOUNT_CODE, COMPANY_CODE, ACCOUNT_YEAR
+	</select>
+
 </sqlMap>

src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java

@@ -25,6 +25,18 @@ import java.util.stream.Collectors;
 
 public class HGCWTools {
 
+    public static class HgCw001 {
+
+        public static Map getMaxAccountPeriod(String companyCode) {
+            Map<String, Object> params = new HashMap<>();
+            params.put("companyCode", companyCode);
+            params.put("accountPeriodStatus",0);
+            List<Map> list = DaoBase.getInstance().query("HGCW001.getMaxAccountPeriod", params);
+            AssertUtils.isEmpty(list, "未找到公司对应的会计期间");
+            return list.get(0);
+        }
+    }
+
     public static class HgCw002 {
         public static UserVO getUserCompany() {
             UserVO userVO = new UserVO();