1.bug修复

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -647,15 +647,15 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 */
 	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo,String operationTime) {
 
-		DistributionParcelListEntityVO vo;
+		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);;
 		// 判断当前查询包件不是否为皮阿落
-		// todo 这里不合理 需要优化
-		if("皮阿诺".equals(distributionStockArticleEntity.getBrand())){
-			vo = advanceDetailClient.getByUnitNoByPyl(unitNo);
-		}else{
-			vo = advanceDetailClient.getByUnitNo(unitNo);
-
-		}
+//		// todo 这里不合理 需要优化
+//		if("皮阿诺".equals(distributionStockArticleEntity.getBrand())){
+//			vo = advanceDetailClient.getByUnitNoByPyl(unitNo);
+//		}else{
+//			vo = advanceDetailClient.getByUnitNo(unitNo);
+//
+//		}
 //
 //		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
 ////		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml

@@ -102,8 +102,8 @@
                ad.firstPackName firsts,
                ad.secondPackName `second`,
                ad.thirdPackName thirdProduct,
-               hdp.productcode materialCode,
-               hdp.productname materialName,
+               t.productcode materialCode,
+               t.productname materialName,
                ad.mscsNum quantity,
                ad.mctsTruck trainNumber,
                (
@@ -112,13 +112,14 @@
                    limit 1
             ) warehouseEntryTimeEnd
         from ht_order_detail od
-                 left join ht_advance_detail ad on ad.unitNo = od.unitNo
-                 left join ht_warehouse w on w.id = od.now_warehouse_id
-                 left join ht_location l on od.location_id = l.id
-                 left join ht_shelf s on l.shelf_id = s.id
-                 left join ht_cargo c on s.cargo_id = c.id
-                 left join ht_detail_product hdp on hdp.unit_no = od.unitNo
+            left join ht_advance_detail ad on ad.unitNo = od.unitNo and ad.delete_time = 0
+            left join ht_warehouse w on w.id = od.now_warehouse_id
+            left join ht_location l on od.location_id = l.id
+            left join ht_shelf s on l.shelf_id = s.id
+            left join ht_cargo c on s.cargo_id = c.id
+            left join (select unit_no,productcode,productname from ht_detail_product where unit_no= #{unitNo} limit 1) t on t.unit_no = ad.unitNo
         where od.unitNo = #{unitNo}
+          and od.delete_time = 0
 
     </select>
 

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java

@@ -60,7 +60,8 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService {
 	@Override
 	public AdvanceDetailEntity getOneByUnitNo(String unitNo) {
 		QueryWrapper<AdvanceDetailEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("unitNo",unitNo);
+		queryWrapper.eq("unitNo",unitNo)
+			.eq("delete_time",0);
 		return advanceDetailMapper.selectOne(queryWrapper);
 	}