模块重命名

hx-common/common-tool/src/main/java/com/fjhx/utils/BigDecimalUtil.java

@@ -153,7 +153,7 @@ public class BigDecimalUtil {
     /**
      * Object转BigDecimal
      */
-    private static BigDecimal objToBigDecimal(Object value) {
+    public static BigDecimal objToBigDecimal(Object value) {
         if (value == null) {
             throw new NullPointerException("参与计算的字段为空");
         }

hx-common/pom.xml

@@ -21,6 +21,7 @@
         <module>common-socket</module>
         <module>common-tool</module>
         <module>service-video</module>
+        <module>service-flow</module>
         <module>library-product</module>
         <module>library-storage</module>
     </modules>

hx-common/service-flow/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hx-common</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-flow</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

hx-common/service-video/src/main/java/com/fjhx/service/video/impl/VideoClassifyServiceImpl.java

@@ -92,14 +92,6 @@ public class VideoClassifyServiceImpl extends ServiceImpl<VideoClassifyMapper, V
         Integer childrenCount = lambdaQuery().eq(VideoClassify::getParentId, id).count();
         Assert.eqZero(childrenCount, "该分类下存在子级分类，无法删除");
 
-//        if (type.equals(ClassifyTypeEnum.PRODUCT_TYPE.getCode())) {
-//            Integer relationCount = productService.lambdaQuery().eq(Product::getClassifyId, id).count();
-//            Assert.eqZero(relationCount, "该分类下存在产品，无法删除");
-//        } else {
-//            Integer relationCount = materialService.lambdaQuery().eq(Material::getClassifyId, id).count();
-//            Assert.eqZero(relationCount, "该分类下存在物料，无法删除");
-//        }
-
         removeById(classifyVo.getId());
     }
 

hx-service-api/pom.xml

@@ -26,10 +26,11 @@
         <module>common-flow-api</module>
         <module>common-rocketmq-api</module>
         <module>service-video-api</module>
-        <module>iot-management-api</module>
-        <module>iot-production-api</module>
+        <module>syringe-management-api</module>
+        <module>syringe-production-api</module>
         <module>storage-api</module>
         <module>storage-restructure-api</module>
+        <module>service-flow-api</module>
     </modules>
 
     <dependencyManagement>

hx-service-api/iot-production-api/pom.xml → hx-service-api/service-flow-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>iot-production-api</artifactId>
+    <artifactId>service-flow-api</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-service-api/iot-management-api/pom.xml → hx-service-api/syringe-management-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>iot-management-api</artifactId>
+    <artifactId>syringe-management-api</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-service-api/syringe-production-api/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hx-service-api</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>syringe-production-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

hx-service/pom.xml

@@ -21,8 +21,8 @@
     </properties>
 
     <modules>
-        <module>iot-management</module>
-        <module>iot-production</module>
+        <module>syringe-management</module>
+        <module>syringe-production</module>
         <module>storage</module>
         <module>storage-restructure</module>
     </modules>
@@ -60,31 +60,31 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>library-product</artifactId>
+                <artifactId>common-flow-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>iot-management-api</artifactId>
+                <artifactId>library-product</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>iot-production-api</artifactId>
+                <artifactId>syringe-management-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>storage-api</artifactId>
+                <artifactId>syringe-production-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>service-file-api</artifactId>
+                <artifactId>storage-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
@@ -94,12 +94,6 @@
                 <version>${hx.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>common-flow-api</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 

hx-service/storage-restructure/pom.xml

@@ -29,11 +29,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-user-api</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
         </dependency>

hx-service/storage/pom.xml

@@ -20,11 +20,6 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>common-tool</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
             <artifactId>storage-api</artifactId>
         </dependency>
 

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockDetailServiceImpl.java

@@ -167,7 +167,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
                 SchedulingActual schedulingActual = new SchedulingActual();
                 schedulingActual.setMaterialCode(materialCode);
                 schedulingActual.setMaterialRfid(rfidCode.toString());
-                schedulingActual.setQuantity((BigDecimal) item.get("quantity"));
+                schedulingActual.setQuantity(BigDecimalUtil.objToBigDecimal(item.get("quantity")));
                 schedulingActual.setType(2);
                 schedulingActual.setJobNo(jobNo);
                 schedulingActual.setFlag(flag);
@@ -191,7 +191,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
         for (Map<String, Object> map : actualList) {
             String materialCode = map.get("materialCode").toString();
             String materialRfid = map.get("materialRfid").toString();
-            BigDecimal quantity = (BigDecimal) map.get("quantity");
+            BigDecimal quantity = BigDecimalUtil.objToBigDecimal(map.get("quantity"));
 
             if (!materialCodeList.contains(materialCode)) continue;
 
@@ -268,7 +268,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
 
         // 获取指定和推荐领料map
         List<Long> flagList = list.stream().map(item -> (Long) item.get("flag")).distinct().collect(Collectors.toList());
-        List<SchedulingActual> schedulingActualListByFlag = getSchedulingActualListByFlag(flagList);
+        List<SchedulingActual> schedulingActualListByFlag = getSchedulingActualListByFlag(flagList, null);
 
         // 赋值实际领料
         setActual(result, schedulingActualListByFlag, codeWidthMap);
@@ -282,8 +282,9 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
         return result;
     }
 
-    private List<SchedulingActual> getSchedulingActualListByFlag(List<Long> flagList) {
+    private List<SchedulingActual> getSchedulingActualListByFlag(List<Long> flagList, String materialCode) {
         return schedulingActualService.list(Wrappers.<SchedulingActual>lambdaQuery()
+                .eq(ObjectUtil.isNotEmpty(materialCode), SchedulingActual::getMaterialCode, materialCode)
                 .in(SchedulingActual::getFlag, flagList));
     }
 
@@ -300,6 +301,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
         wrapper.eq(ObjectUtil.isNotEmpty(materialCode), "m.Code", materialCode);
         wrapper.eq(ObjectUtil.isNotEmpty(jobNo), "u.JobNo", jobNo);
         wrapper.eq("sca.type", pickingType);
+        wrapper.groupBy("sca.id");
 
         return baseMapper.selectClaimed(wrapper);
     }
@@ -327,14 +329,14 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
         Map<String, List<Map<String, Object>>> materialGroupName = materialList.stream().collect(Collectors.groupingBy(
                 item -> item.get("name").toString().split("-")[0]));
 
-        List<Map<String, Object>> result = new ArrayList<>();
-
         // 物料
         Map<String, Float> codeWidthMap = materialList.stream().collect(Collectors.toMap(
                 item -> item.get("code").toString(),
                 item -> (Float) item.get("width")
         ));
 
+        List<Map<String, Object>> result = new ArrayList<>();
+
         for (Map.Entry<String, List<Map<String, Object>>> entry : materialGroupName.entrySet()) {
             String key = entry.getKey(); // 面料名称
             List<Map<String, Object>> value = entry.getValue(); // 面料属性集合
@@ -352,7 +354,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
 
                 // 获取指定和推荐领料map
                 List<Long> flagList = listByCode.stream().map(item -> (Long) item.get("flag")).distinct().collect(Collectors.toList());
-                List<SchedulingActual> schedulingActualListByFlag = getSchedulingActualListByFlag(flagList);
+                List<SchedulingActual> schedulingActualListByFlag = getSchedulingActualListByFlag(flagList, code);
 
                 // 赋值实际领料
                 setActual(temp, schedulingActualListByFlag, codeWidthMap);
@@ -531,7 +533,10 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
                             HashMap<String, Object> map = new HashMap<>();
                             String jobNo = item.get("jobNo").toString();
                             map.put("jobNo", jobNo);
-                            map.put("userName", JobNoMap.get(jobNo).get("userName"));
+
+                            map.put("userName", JobNoMap.get(jobNo) == null ?
+                                    "未知（工号：" + jobNo + ")" :
+                                    JobNoMap.get(jobNo).get("userName"));
                             map.put("sum", 1);
                             return map;
                         },

hx-service/iot-management/pom.xml → hx-service/syringe-management/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>iot-management</artifactId>
+    <artifactId>syringe-management</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -30,12 +30,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>iot-management-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>service-file-api</artifactId>
+            <artifactId>syringe-management-api</artifactId>
         </dependency>
 
     </dependencies>

hx-service/iot-management/src/main/java/com/fjhx/IotManagementApplication.java → hx-service/syringe-management/src/main/java/com/fjhx/IotManagementApplication.java

@@ -11,7 +11,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @SpringCloudApplication
 public class IotManagementApplication {
 
-    private static final String APP_NAME = "iot-management";
+    private static final String APP_NAME = "syringe-management";
 
     public static void main(String[] args) {
         BladeApplication.run(APP_NAME, IotManagementApplication.class, args);

hx-service/iot-production/pom.xml → hx-service/syringe-production/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>iot-production</artifactId>
+    <artifactId>syringe-production</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -25,12 +25,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>service-file-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>iot-production-api</artifactId>
+            <artifactId>syringe-production-api</artifactId>
         </dependency>
 
         <dependency>