修改录批次

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

@@ -161,6 +161,10 @@ public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeS
         mapValue.put("batchId",map1.get("batchIds"));
         mapValue.put("portId",portId);
         mapValue.put("resultMaterialNumber",DataChange.dataToBigDecimal(map.get("resultNumberOfLoans")));
+        if(mapValue.get("batchId") ==null || DataChange.dataToBigDecimal(mapValue.get("batchId")).compareTo(new BigDecimal(0))==0){
+            //如果是录入批次，则传新增批次的批次id
+            mapValue.put("batchId",map1.get("batchId"));
+        }
         wmshboundFeign.addWarehousingResult(mapValue);
         i += amsshipDeliveryNoticeMapper.insertSelective(amsshipDeliveryNotice);
         return i ;

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

@@ -90,9 +90,10 @@ public class DilBatchServiceImpl  implements IDilBatchService {
             dilBatchInfacotry.setBatchId(batchId1);
             dilBatch.setInsertTime(new Date());
             dilBatch.setInsertUsername(userId);
+            dilBatch.setInsertUpdateRemark("人工录入");
             int i = dilBatchMapper.insertSelective(dilBatch);
             if (i==0){
-                System.out.println("新增主表失败!!!");
+                System.out.println("新增批次主表失败!!!");
             }
         }
         BigDecimal batchIdInfacotryId = dilBatchInfacotryMapper.selectDilBatchId();

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

@@ -326,7 +326,6 @@
       </if>
       and ADN.DELETED = 0
       and ADN.NOTICE_DISTRIBUTION_STATUS = 1
-      and APO.PURCHASE_ORDER_NO is not null
       order by  DB.INSERT_TIME desc
     </where>
   </select>
@@ -358,7 +357,6 @@
       </if>
       and ADA.DELETED = 0
       and ADA.ATTORNEY_DISTRIBUTION_STATUS = 1
-      and APO.PURCHASE_ORDER_NO is not null
       order by  DB.INSERT_TIME desc
     </where>
   </select>