Merge branch 'dev' into dev_WMS20260401

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java

@@ -7,6 +7,7 @@ import com.mhd.system.api.factory.RemoteWmsFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -64,7 +65,7 @@ public interface WmsServiceFeign {
      * 查询物料库存列表不分页
      */
     @GetMapping("/materialInventoryApi/listAll")
-    public AjaxResult materialInventoryApiListAll(MaterialInventoryDTO materialInventoryDTO);
+    public AjaxResult materialInventoryApiListAll(@SpringQueryMap MaterialInventoryDTO materialInventoryDTO);
 
     /**
      * oms下发单保存

mhd_oms/Dockerfile

@@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
 # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp
 VOLUME /tmp
 #将当前mhd_special_logistics.jar 复制到容器根目录下
-ADD mhd_oms.jar mhd_oms.jar
+ADD target/mhd_oms.jar mhd_oms.jar
 #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
 EXPOSE 8017
 # 运行jar包

mhd_oms/src/main/resources/bootstrap.yml

@@ -17,20 +17,20 @@ spring:
     nacos:
       discovery:
         #        server-addr: 127.0.0.1:8848
-      server-addr: 10.33.0.129:6010
         # 线上测试环境配置 容器名+端口号
+        server-addr: 10.33.0.129:6010
+      #        server-addr: 10.102.192.5:6848
+      #        username: nacos
+      #        password: manhuoda@2023
+      config:
+        #        server-addr: 127.0.0.1:8848
+        #         线上测试环境配置 容器名+端口号
+        server-addr: 10.33.0.129:6010
         #        server-addr: 10.102.192.5:6848
         #        username: nacos
         #        password: manhuoda@2023
         #线上正式环境
         #        server-addr: 10.102.192.105:6848
-      config:
-        #        server-addr: 127.0.0.1:8848
-        server-addr: 10.33.0.129:6010
-        # 线上测试环境配置 容器名+端口号
-        #        server-addr: 10.102.192.5:6848
-        #        username: nacos
-        #        password: manhuoda@2023
         # 锁定server端的配置文件（读取它的配置项）
         namespace:   # 命名空间id
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java

@@ -634,7 +634,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
             inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
         } else if ("入库".equals(adjustAction)){
-            if (materialInventory == null) {
+            if ("1".equals(materialInventoryParamDO.getIsNew())) {
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(BigDecimal.ZERO);
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventoryParamDO.getQuantity());
                 inventoryAdjustmentRecord.setFreezeBeforeQuantity(BigDecimal.ZERO);

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryParamDO.java

@@ -100,4 +100,6 @@ public class MaterialInventoryParamDO extends MaterialBaseDO {
 
     private String batchNumber;
 
+    private String isNew;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java

@@ -1063,6 +1063,7 @@ public class StockShelfOrderDomainService {
 //                materialInventoryMapper.insert(materialInventory);
 
                 inventoryParamDO.setType("1");
+                inventoryParamDO.setIsNew("1");
 
                 //库存调整记录
                 materialInventoryService.xgkc(inventoryParamDO);
@@ -1120,9 +1121,10 @@ public class StockShelfOrderDomainService {
                 inventoryParamDO.setQuantity(shelfMaterialDetail.getShelvesQuantity());
                 inventoryParamDO.setType("1");
                 inventoryParamDO.setUpdateTime(new Date());
-                materialInventoryService.xgkc(inventoryParamDO);
+
                 //库存调整记录
                 materialInventoryService.kctzjl(inventoryParamDO, "入库", loginUser);
+                materialInventoryService.xgkc(inventoryParamDO);
                 //抄码商品对照数据插入
                 copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO);
             }