Merge remote-tracking branch 'origin/master'

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

@@ -166,7 +166,21 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             map.put("Sqe",sqe);
             map.put("totalId",totalId);
             TmstruckUnloadResult tmstruckUnloadResult = generateUnload(map);
-            tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+            try{
+                Integer resultId=tmstruckUnloadResultMapper.checkMaterialIdUnload(totalId, DataChange.dataToBigDecimal(map.get("materialId")));
+                if(orderType == 11 && resultId != null){
+                    //如果已经存在，根据主键更新
+                    tmstruckUnloadResult.setResultId(new BigDecimal(resultId));
+                    tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
+                }else{
+                    //不存在，插入
+                    tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+                //出现异常，插入
+                tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+            }
             //更新路段顺序号
             //内转只要是卸货都直接关闭订单 事务跨服务更改同表同一行数据 不能调用 会锁行
             //如果没有净重更新路段顺序号需要继续回皮 有就结束订单

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

@@ -1931,6 +1931,7 @@
                     RCA.CAPACITY_NUMBER "newCapacityNo",
                     NVL(OO.CAPACITY_ID,0)  "capacityIds",
                     OO.CAPACITY_ID "capacityId",
+                    DECODE(NVL(OO.IS_ACCEPT,0),1,'已接收','未接收') "isAccept",
                     ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
                     ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
                     OO.ORDER_LINE_SEQUENCE "lineSequence",