Merge branch 'dev' into pre-production

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java

@@ -94,12 +94,6 @@ public interface IAdvanceClient {
 	@GetMapping(API_PREFIX + "/findAdvanceEntityByLogiBillNoAndOrderCode")
 	List<AdvanceEntity> findAdvanceEntityByLogiBillNoAndOrderCode(@RequestParam String logiBillNo,@RequestParam String orderCode);
 
-
+	@GetMapping(API_PREFIX + "/getAdvanceList")
-
+	List<AdvanceEntity> getAdvanceList(@RequestParam String orderSelfNum);
-
-
-
-
-
-
 }

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

@@ -359,8 +359,11 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				throw new CustomerException(405, "未找到对应的订单信息");
 			}
 
-
+			List<AdvanceEntity> ls = advanceClient.getAdvanceList(orderSelfNum);
-			Integer total = advanceEntity.getTotal();//发货总数量
+			Integer total = 0;//发货总数量
+			for (AdvanceEntity ad:ls){
+				total = total + ad.getTotal();
+			}
 
 			Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
 			String destinationWarehouse= "";
@@ -675,6 +678,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		}else{
 			DistributionParcelListEntity entity = new DistributionParcelListEntity();
 			BeanUtil.copyProperties(vo, entity);
+			entity.setQuantity(1);
 			entity.setOrderPackageCode(vo.getPacketBarCode());
 			entity.setConditions(1);
 			entity.setWarehouse(distributionStockArticleEntity.getWarehouse());

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java

@@ -90,4 +90,9 @@ public class AdvanceClient implements IAdvanceClient {
 	public List<AdvanceEntity> findAdvanceEntityByLogiBillNoAndOrderCode(String logiBillNo, String orderCode) {
 		return service.findAdvanceEntityByLogiBillNoAndOrderCode(logiBillNo,orderCode);
 	}
+
+	@Override
+	public List<AdvanceEntity> getAdvanceList(String orderSelfNum) {
+		return service.getAdvanceList(orderSelfNum);
+	}
 }

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

@@ -50,4 +50,7 @@ public interface AdvanceMapper  {
     List<AdvanceEntity> getEntityByMctsTruck(@Param("orderSelfNum") String orderSelfNum, @Param("mctsTruck") String mctsTruck);
 
 	List<AdvanceEntity> findAdvanceEntityByLogiBillNoAndOrderCode(@Param("logiBillNo") String logiBillNo, @Param("orderCode")String orderCode);
+
+    List<AdvanceEntity> getAdvanceList(@Param("orderSelfNum") String orderSelfNum);
+
 }

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

@@ -61,5 +61,11 @@
         SELECT adv.* from ht_advance adv LEFT JOIN ht_waybill_order wo on wo.advance_id=adv.id where wo.waybill_no =#{logiBillNo} and wo.orderSelfNum=#{orderCode} and wo.status !=-1
     </select>
 
+    <select id="getAdvanceList" resultType="com.logpm.oldproject.entity.AdvanceEntity">
+        select *
+        from ht_advance
+        where orderSelfNum = #{orderSelfNum}
+          and delete_time = 0
+    </select>
 
 </mapper>

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

@@ -50,4 +50,6 @@ public interface IAdvanceService  {
 	 * @return
 	 */
 	List<AdvanceEntity> findAdvanceEntityByLogiBillNoAndOrderCode(String logiBillNo, String orderCode);
+
+    List<AdvanceEntity> getAdvanceList(String orderSelfNum);
 }

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

@@ -74,4 +74,9 @@ public class AdvanceServiceImpl implements IAdvanceService {
 	public List<AdvanceEntity> findAdvanceEntityByLogiBillNoAndOrderCode(String logiBillNo, String orderCode) {
 		return advanceMapper.findAdvanceEntityByLogiBillNoAndOrderCode(logiBillNo,orderCode);
 	}
+
+	@Override
+	public List<AdvanceEntity> getAdvanceList(String orderSelfNum) {
+		return advanceMapper.getAdvanceList(orderSelfNum);
+	}
 }