单据挑料,增加厂商

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -210,6 +210,8 @@ public class DataInitManager {
         // 虚拟仓手动出库
         // 虚拟仓手动出库
         addNewFunctionMenu(4, manual, "manualVirOut", "虚拟仓手动出库", "manualVirOut", "manualVirOut/index", "manualVirOut", functionMenuMap);
         addNewFunctionMenu(4, manual, "manualVirOut", "虚拟仓手动出库", "manualVirOut", "manualVirOut/index", "manualVirOut", functionMenuMap);
 
 
+        // 手动单据入库
+        addNewFunctionMenu(5, manual, "manualWarehouseReceipt", "手动单据转库", "manualWarehouseReceipt", "manualWarehouseReceipt/index", "manualWarehouseReceipt", functionMenuMap);
 
 
         Menu doc = Menu.CreatePMenu("单据操作", 5, "doc", 1, "docOp", raw);
         Menu doc = Menu.CreatePMenu("单据操作", 5, "doc", 1, "docOp", raw);
 
 
@@ -222,9 +224,6 @@ public class DataInitManager {
         //单据退料
         //单据退料
         addNewFunctionMenu(3, doc, "docReturn", "单据退料", "docReturn", "receipt/docReturn/index", "docRe", functionMenuMap);
         addNewFunctionMenu(3, doc, "docReturn", "单据退料", "docReturn", "receipt/docReturn/index", "docRe", functionMenuMap);
 
 
-        // 手动单据入库
-        addNewFunctionMenu(4, doc, "manualWarehouseReceipt", "手动单据入库", "manualWarehouseReceipt", "manualWarehouseReceipt/index", "manualWarehouseReceipt", functionMenuMap);
-
         //手动出库
         //手动出库
         addNewFunctionMenu(6, raw, "outVir", "手动出库", "outVir", "outVir/index", "docOut", functionMenuMap);
         addNewFunctionMenu(6, raw, "outVir", "手动出库", "outVir", "outVir/index", "docOut", functionMenuMap);
 
 

src/main/java/com/neotel/smfcore/custom/luxsan/api/bean/result/FetchMoveTicketResult.java

@@ -27,4 +27,7 @@ public class FetchMoveTicketResult {
     private int QTY;
     private int QTY;
     // 移动类型
     // 移动类型
     private String MOVE_TYPE;
     private String MOVE_TYPE;
+
+    //厂商
+    private String BRAND;
 }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/bean/dto/FetchMoveTicketDto.java

@@ -29,6 +29,8 @@ public class FetchMoveTicketDto {
     // 移动类型
     // 移动类型
     private String moveType;
     private String moveType;
 
 
+    private String brand;
+
 
 
     public static FetchMoveTicketDto convertFetchMoveTicketDto(FetchMoveTicketResult result) {
     public static FetchMoveTicketDto convertFetchMoveTicketDto(FetchMoveTicketResult result) {
         FetchMoveTicketDto dto = new FetchMoveTicketDto();
         FetchMoveTicketDto dto = new FetchMoveTicketDto();
@@ -42,6 +44,7 @@ public class FetchMoveTicketDto {
         dto.setDstBatch(result.getDST_BATCH());
         dto.setDstBatch(result.getDST_BATCH());
         dto.setQty(result.getQTY());
         dto.setQty(result.getQTY());
         dto.setMoveType(result.getMOVE_TYPE());
         dto.setMoveType(result.getMOVE_TYPE());
+        dto.setBrand(result.getBRAND());
         return dto;
         return dto;
     }
     }
 
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/TicketController.java

@@ -80,6 +80,7 @@ public class TicketController {
                 result.setDST_BATCH(orderItem.getDstBatch());
                 result.setDST_BATCH(orderItem.getDstBatch());
                 result.setQTY(orderItem.getQty());
                 result.setQTY(orderItem.getQty());
                 result.setMOVE_TYPE(orderItem.getMoveType());
                 result.setMOVE_TYPE(orderItem.getMoveType());
+                result.setBRAND(orderItem.getBrand());
                 ticketList.add(result);
                 ticketList.add(result);
             }
             }
         }
         }
@@ -140,6 +141,7 @@ public class TicketController {
                 item.setDstBatch(result.getDST_BATCH());
                 item.setDstBatch(result.getDST_BATCH());
                 item.setQty(result.getQTY());
                 item.setQty(result.getQTY());
                 item.setMoveType(result.getMOVE_TYPE());
                 item.setMoveType(result.getMOVE_TYPE());
+                item.setBrand(result.getBRAND());
                 itemList.add(item);
                 itemList.add(item);
             }
             }