增加库存盘点和物料分类管理

ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java

@@ -36,13 +36,16 @@ public class ApplicationTest {
 //                "wms_customer" ,
 //                "wms_inventory",
 //                "wms_inventory_history",
-                "wms_receipt_order",
-                "wms_receipt_order_detail"
+//                "wms_receipt_order",
+//                "wms_receipt_order_detail"
 //                "wms_shipment_order",
 //                "wms_shipment_order_detail",
 //                "wms_inventory_movement",
 //                "wms_inventory_movement_detail",
 //                "wms_delivery"
+//                "wms_inventory_check",
+//                "wms_inventory_check_detail"
+                "wms_item_type"
         );
         // 查询表信息
         List<GenTable> tableList = genTableService.selectGenTableByName(tableNames);

wms/src/main/java/com/cyl/wms/constant/ReceiptOrderConstant.java

@@ -11,4 +11,14 @@ public interface ReceiptOrderConstant {
     int ALL_IN = 3;
     // 作废
     int DROP = 2;
+
+    /*订单类型*/
+    //采购
+    int PURCHASE = 2;
+    //外协
+    int OUTSOURCING = 2;
+    //退货
+    int RETURN = 3;
+    //盘盈入库
+    int CHECK = 4;
 }

wms/src/main/java/com/cyl/wms/constant/ShipmentOrderConstant.java

@@ -10,4 +10,13 @@ public interface ShipmentOrderConstant {
   int ALL_IN = 13;
   // 作废
   int DROP = 14;
+
+  /*订单类型*/
+  int SALE = 11;
+  int OUTSOURCING = 12;
+  int RANSFER = 13;
+  //部门领料出库
+  int DEPT = 14;
+  //盘亏出库
+  int CHECK = 15;
 }

wms/src/main/java/com/cyl/wms/domain/ItemTypeTreeSelect.java

@@ -0,0 +1,72 @@
+package com.cyl.wms.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Treeselect树结构实体类
+ *
+ * @author zhangcheng
+ */
+public class ItemTypeTreeSelect implements Serializable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 节点ID
+     */
+    private Long id;
+
+    /**
+     * 节点名称
+     */
+    private String label;
+
+    /**
+     * 子节点
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<ItemTypeTreeSelect> children;
+
+    public ItemTypeTreeSelect() {
+
+    }
+
+
+    public ItemTypeTreeSelect(ItemType itemType) {
+        this.id = itemType.getItemTypeId();
+        this.label = itemType.getTypeName();
+        this.children = itemType.getChildren().stream().map(ItemTypeTreeSelect::new).collect(Collectors.toList());
+    }
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public List<ItemTypeTreeSelect> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<ItemTypeTreeSelect> children) {
+        this.children = children;
+    }
+
+
+}

wms/src/main/java/com/cyl/wms/pojo/vo/form/InventoryCheckFrom.java

@@ -0,0 +1,21 @@
+package com.cyl.wms.pojo.vo.form;
+
+import com.cyl.wms.domain.InventoryCheck;
+import com.cyl.wms.pojo.vo.InventoryCheckDetailVO;
+import com.cyl.wms.pojo.vo.ItemVO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 盘库单据 数据视图对象
+ *
+ * @author zhangcheng
+ */
+@Data
+public class InventoryCheckFrom extends InventoryCheck {
+    // 盘库单据详情
+    private List<InventoryCheckDetailVO> details;
+    // 所有商品
+    private List<ItemVO> items;
+}