导入方法修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java

@@ -111,6 +111,8 @@ public class BusinesstypeController {
         mapDropDown.put(2, itemTypes);
         String[] itemStatuses = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_STATUS);
         mapDropDown.put(3, itemStatuses);
+        String[] onTheWayArea = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(3, onTheWayArea);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(7, available);
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java

@@ -112,10 +112,10 @@ public class LocationController {
         // 手动创建导出 demo
         List<LocationImportExcelVO> list = Arrays.asList();
         Map<Integer, String[]> mapDropDown = new HashMap<>();
-        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCUMENT_TYPE);
-        mapDropDown.put(3, type);
-        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
-        mapDropDown.put(10, available);;
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
+        mapDropDown.put(7, type);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(18, available);;
         // 输出
         ExcelUtils.write(response, "库位导入模板.xls", "库位列表", LocationImportExcelVO.class, list,mapDropDown);
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationImportExcelVO.java

@@ -73,7 +73,7 @@ public class LocationImportExcelVO {
     private String userGroupCode;
 
     @ExcelProperty(value = "是否可用", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.LOCATION_TYPE)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String available;
 
     @ExcelProperty(value = "生效时间")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java

@@ -108,12 +108,11 @@ public class ParamsettingController {
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] usableOpeartors = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.STRATEGY_PARAM_OPEARTOR);
         mapDropDown.put(3, usableOpeartors);
-        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
-        mapDropDown.put(11, currency);
-        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.OWNER_TYPE);
-        mapDropDown.put(13, type);;
-        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(14, available);;
+        String[] dataType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DATA_TYPE);
+        mapDropDown.put(4, dataType);
+        String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(8, isRequired);
+
         // 输出
         ExcelUtils.write(response, "参数设置导入模板.xls", "参数设置列表", ParamsettingImportExcelVO.class, list,mapDropDown);
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java

@@ -110,7 +110,7 @@ public class ProductionlineController {
         String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PROCESS_TYPE);
         mapDropDown.put(3, type);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(6, available);;
+        mapDropDown.put(7, available);;
         // 输出
         ExcelUtils.write(response, "参数设置导入模板.xls", "参数设置列表", ProductionlineImportExcelVO.class, list,mapDropDown);
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java

@@ -106,10 +106,11 @@ public class RecordsettingController {
         // 手动创建导出 demo
         List<RecordsettingImportExcelVO> list = Arrays.asList();
         Map<Integer, String[]> mapDropDown = new HashMap<>();
-        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
-        mapDropDown.put(2, currency);
+        String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
+        mapDropDown.put(1, interfaceType);
+
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(4, available);
+        mapDropDown.put(2, available);
         // 输出
         ExcelUtils.write(response, "记录设置导入模板.xls", "记录设置列表", RecordsettingImportExcelVO.class, list,mapDropDown);
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java

@@ -114,8 +114,7 @@ public class RuleController {
         );
         // 手动创建导出 demo
         Map<Integer, String[]> mapDropDown = new HashMap<>();
-        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(4, available);
+
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java

@@ -111,6 +111,8 @@ public class SalepriceController {
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(4, available);
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(2, currency);
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java

@@ -110,7 +110,9 @@ public class ShiftController {
         // 手动创建导出 demo
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(4, available);
+        mapDropDown.put(9, available);
+        String[] endAtNextDay = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(8, endAtNextDay);
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java

@@ -111,6 +111,9 @@ public class StdcostpriceController {
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(4, available);
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(2, currency);
+
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceImportExcelVo.java

@@ -36,8 +36,7 @@ public class StdcostpriceImportExcelVo {
     @DictFormat(DictTypeConstants.CURRENCY)
     private String currency;
 
-    @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "价格不能为空")
+    @ExcelProperty("价格")
     private BigDecimal price;
 
     @ExcelProperty(value = "是否可用", converter = DictConvert.class)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java

@@ -108,8 +108,12 @@ public class SupplierController {
         );
         // 手动创建导出 demo
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(11, currency);
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SUPPLIER_TYPE);
+        mapDropDown.put(13, type);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(4, available);
+        mapDropDown.put(14, available);
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java

@@ -111,7 +111,16 @@ public class SupplieritemController {
         // 手动创建导出 demo
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(4, available);
+        mapDropDown.put(13, available);
+        String[] supplierUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(3, supplierUom);
+        String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(5, packUnit);
+        String[] altPackUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(7, altPackUnit);
+        String[] settlementType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SETTLEMENT_TYPE);
+        mapDropDown.put(12, settlementType);
+
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieriteamImportExcelVo.java

@@ -26,7 +26,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
 public class SupplieriteamImportExcelVo  {
 
 
-
     @ExcelProperty("供应商代码")
     private String supplierCode;
 
@@ -36,7 +35,7 @@ public class SupplieriteamImportExcelVo  {
     @ExcelProperty("供应商物料代码")
     private String supplierItemCode;
 
-    @ExcelProperty(value = "是否为空", converter = DictConvert.class)
+    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.UOM)
     private String supplierUom;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java

@@ -110,7 +110,7 @@ public class SystemcalendarController {
         // 手动创建导出 demo
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(4, available);
+        mapDropDown.put(3, available);
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java

@@ -112,7 +112,7 @@ public class TeamController {
         // 手动创建导出 demo
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(4, available);
+        mapDropDown.put(7, available);
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java

@@ -112,8 +112,12 @@ public class TransactiontypeController {
         );
         // 手动创建导出 demo
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] allowNegative = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(7, allowNegative);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(4, available);
+        mapDropDown.put(8, available);
+        String[] isSoftDeleted = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(9, isSoftDeleted);
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java

@@ -118,6 +118,8 @@ public class WarehouseController {
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(4, available);
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
+        mapDropDown.put(3, type);
         // 输出
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java

@@ -108,7 +108,9 @@ public class WorkshopController {
         List<WorkshopImportExcelVo> list = Arrays.asList();
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(6, available);
+        mapDropDown.put(4, available);
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORKSHOP_TYPE);
+        mapDropDown.put(3, type);
         // 输出
         ExcelUtils.write(response, "车间导入模板.xls", "车间列表", WorkshopImportExcelVo.class, list,mapDropDown);
     }