仓库名修改

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java

@@ -19,10 +19,7 @@ import com.nflg.wms.common.exception.NflgException;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.document.OutMaterialScanRecord;
-import com.nflg.wms.common.pojo.dto.InventoryInDTO;
+import com.nflg.wms.common.pojo.dto.*;
-import com.nflg.wms.common.pojo.dto.InventoryForOutDTO;
-import com.nflg.wms.common.pojo.dto.InventoryOutDTO;
-import com.nflg.wms.common.pojo.dto.MaterialQRCodeContentDTO;
 import com.nflg.wms.common.pojo.qo.*;
 import com.nflg.wms.common.pojo.vo.*;
 import com.nflg.wms.common.util.EecExcelUtil;
@@ -65,6 +62,9 @@ public class OutProduceController extends BaseController {
     @Resource
     private IWmsInventoryService inventoryService;
 
+    @Resource
+    private IWmsWarehouseService wmsWarehouseService;
+
     @Resource
     private RedissonClient redissonClient;
 
@@ -95,6 +95,9 @@ public class OutProduceController extends BaseController {
     @Resource
     private IWmsQrCodeMasterService qrCodeMasterService;
 
+    @Resource
+    private IOptRecordService optRecordService;
+
     /**
      * 查询SAP领料订单数据
      */
@@ -109,7 +112,7 @@ public class OutProduceController extends BaseController {
         Map<String, List<Zwm3a07VO>> maps = vos.stream().collect(Collectors.groupingBy(Zwm3a07VO::getKey1));
         maps.forEach((key, items) -> {
             List<InventoryInDTO> imaps = inventoryService.getNum(items.get(0).getDwerk(), items.get(0).getLgort2(), items.stream().map(Zwm3a07VO::getMatnr).toList());
-            String wname = inventoryService.getName(items.get(0).getDwerk(), items.get(0).getLgort2());
+            String wname = wmsWarehouseService.getName(items.get(0).getDwerk(), items.get(0).getLgort2());
             items.forEach(item -> {
                 item.setLeftNum(imaps.stream()
                         .filter(it -> StrUtil.equals(it.getMaterialNo(), item.getMatnr()))
@@ -566,6 +569,14 @@ public class OutProduceController extends BaseController {
                         }).toList()
                 )
         );
+        OptRecordDTO optRecordDTO = new OptRecordDTO();
+//        optRecordDTO.setOrderId();
+//        optRecordDTO.setOperator();
+//        optRecordDTO.setOperationTime();
+//        optRecordDTO.setOperationType();
+        optRecordService.add(optRecordDTO);
+
+
         outProduceTicketService.lambdaUpdate()
                 .set(WmsOutProduceTicket::getMatDoc, vo.getMat_doc())
                 .set(WmsOutProduceTicket::getDocYear, vo.getDocYear())

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseVO.java

@@ -33,6 +33,7 @@ public class WarehouseVO extends WarehouseSimpleVO {
      */
     private String remark;
 
+
     /**
      * 创建人
      */

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java

@@ -17,6 +17,9 @@ public class Zwm3a07VO {
 
     private Long id;
 
+    //仓库名
+    private String wname;
+
     //订单号
     private String aufnr;
 
@@ -125,9 +128,6 @@ public class Zwm3a07VO {
     //MRP 控制者（物料计划人）
     private String dispo;
 
-    //仓库名
-    private String wname;
-
     /**
      * 仓库可领用数量
      */

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInventoryMapper.java

@@ -28,8 +28,6 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
 
     List<InventoryInDTO> getLockedNum(String factoryNo, String warehouseNo, List<String> materialNos);
 
-    String getWname(String factoryNo, String warehouseNo);
-
     BigDecimal getNumOne(String factoryNo, String warehouseNo, String materialNo);
 
     BigDecimal getLockedNumOne(String factoryNo, String warehouseNo, String materialNo);

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java

@@ -34,4 +34,6 @@ public interface WmsWarehouseMapper extends BaseMapper<WmsWarehouse> {
     WarehouseVO getInfo(Long id);
 
     Boolean isEnableLocation(String factoryNo, String warehouseNo);
+
+    String getWname(String factoryNo, String warehouseNo);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java

@@ -39,14 +39,6 @@ public interface IWmsInventoryService extends IService<WmsInventory> {
      */
     List<InventoryInDTO> getNum(String factoryNo, String warehouseNo, List<String> materialNos);
 
-    /**
-     * 获取可用的库存数量，实际库存减去锁定库存
-     * @param factoryNo   工厂编号
-     * @param warehouseNo 仓库编号
-     * @return 工厂名
-     */
-    String getName(String factoryNo, String warehouseNo);
-
     /**
      * 获取可用的库存数量，实际库存减去锁定库存
      * @param factoryNo   工厂编号

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java

@@ -45,4 +45,12 @@ public interface IWmsWarehouseService extends IService<WmsWarehouse> {
     WarehouseVO getInfo(Long id);
 
     Boolean isEnableLocation(String factoryNo, String warehouseNo);
+
+    /**
+     * 获取工厂名
+     * @param factoryNo   工厂编号
+     * @param warehouseNo 仓库编号
+     * @return 工厂名
+     */
+    String getName(String factoryNo, String warehouseNo);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java

@@ -179,10 +179,6 @@ public class WmsInventoryServiceImpl extends ServiceImpl<WmsInventoryMapper, Wms
         return inventoryNums;
     }
 
-    @Override
-    public String getName(String factoryNo, String warehouseNo) {
-        return baseMapper.getWname(factoryNo,warehouseNo);
-    }
 
     @Override
     public BigDecimal getNumOne(String factoryNo, String warehouseNo, String materialNo) {

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java

@@ -129,4 +129,9 @@ public class WmsWarehouseServiceImpl extends ServiceImpl<WmsWarehouseMapper, Wms
     public Boolean isEnableLocation(String factoryNo, String warehouseNo) {
         return baseMapper.isEnableLocation(factoryNo, warehouseNo);
     }
+
+    @Override
+    public String getName(String factoryNo, String warehouseNo) {
+        return baseMapper.getWname(factoryNo,warehouseNo);
+    }
 }

nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml

@@ -84,4 +84,11 @@
         INNER JOIN dictionary_item di ON wh.factory_id=di."id"
         WHERE di."value"=#{factoryNo} AND wh."no"=#{warehouseNo}
     </select>
+
+    <select id="getName" resultType="java.lang.String">
+        SELECT name
+        FROM wms_inventory a,dictonary_item b
+        WHERE a.factory_no=b.id AND a.warehouse_no=#{warehouseNo} AND a.no=#{factoryNo}
+    </select>
+
 </mapper>