修改

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -238,10 +238,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             }
             map.put("materialId",materialId);
             //判断此物资是不是已经有净重了，如果有抛出异常
-            int netWeightCount = tmstruckWeightResultMapper.getHaveNetWeightByMaterial(map);
-            if(netWeightCount != 0){
-                throw new Exception("该物资已有净重，不能再次录入");
-            }
+            //int netWeightCount = tmstruckWeightResultMapper.getHaveNetWeightByMaterial(map);
+            //if(netWeightCount != 0){
+            //    throw new Exception("该物资已有净重，不能再次录入");
+            //}
             tmstruckWeightResult.setMaterialId(materialId);
             tmstruckWeightResult.setMaterialNum(DataChange.dataToBigDecimal(map.get("goodNum")));
             BigDecimal materialNum = DataChange.dataToBigDecimal(map.get("goodNum"));
@@ -251,7 +251,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 throw new Exception("该订单没有该物资分录");
             }
             BigDecimal saleMaterialId = DataChange.dataToBigDecimal(saleMaterialMes.get("saleMaterialId"));//销售订单存放物资子表id
+            BigDecimal orderMaterialId = DataChange.dataToBigDecimal(saleMaterialMes.get("orderMaterialId"));
             BigDecimal materialWeight = DataChange.dataToBigDecimal(saleMaterialMes.get("materialWeight"));//旧总理重
+            map.put("orderMaterialId",orderMaterialId);
+            map.put("saleMaterialId",saleMaterialId);
             BigDecimal newWeight = null;
             if (materialWeight.intValue() != 0) { //如果总重量不为0，才进行重量更新
                 BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(saleMaterialMes.get("orderMaterialNumber"));//旧件数
@@ -758,10 +761,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                         tmstruckWeightResultMapper.updateOrderLineSqeBySqe(orderId,orderLineSqe);
                     }
                 }
-
-
-
-
             }else{
                 tmstruckWeightResultMapper.linkageDeleteTransportOrder(orderNumber);
             }

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -1003,10 +1003,13 @@
         AND RM.MATERIAL_SPECIFICATION || '(' ||  RM.MATERIAL_MODEL || ')' = #{goodspa}
     </select>
     <select id="getSaleOrderMaterialNum" resultType="java.util.Map" parameterType="map">
-        select OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        select
+        distinct
+        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
         ASM.MATERIAL_WEIGHT "materialWeight",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
-        ASM.MATERIAL_NUMBER "materialNumber"
+        ASM.MATERIAL_NUMBER "materialNumber",
+        OOM.ORDER_MATERIAL_ID   "orderMaterialId"
         from AMS_SALE_ORDER_MATERIAL ASOM
         left join OMSTRUCK_ORDER OO on OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
         left join AMS_SALE_TRUCKNO_MATERIAL ASTM on ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
@@ -1015,6 +1018,7 @@
         where ASM.MATERIAL_ID = #{materialId}
         AND OO.ORDER_ID = #{orderId}
         AND OOM.MATERIAL_ID = #{materialId}
+        fetch first 1 row only
     </select>
 
 
@@ -1050,6 +1054,9 @@
         </if>
         WHERE OOM.ORDER_ID = #{orderId}
         and OOM.MATERIAL_ID = #{materialId}
+        <if test="orderMaterialId != null">
+            and OOM.ORDER_MATERIAL_ID = #{orderMaterialId}
+        </if>
     </update>
     <update id="updateSaleMaterialId">
         update AMS_SALE_MATERIAL

src/main/resources/com/steerinfo/dil/mapper/UtilsMapper.xml

@@ -19,7 +19,8 @@
 <!--  通过订单Id 或运输订单号 修改 订单状态  -->
     <update id="updateOrderStatusByOrderIdOrNum" parameterType="java.util.Map">
         update OMSTRUCK_ORDER OO
-        set OO.ORDER_STATUS = #{orderStatus}
+        set OO.ORDER_STATUS = #{orderStatus},
+            OO.INSERT_UPDATE_REMARK = 'join完成订单,utilxml23行'
         <where>
             <if test="orderId != null">
                 OO.ORDER_ID = #{orderId}

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout