Explorar o código

处理获取发货单的bug

yujia %!s(int64=7) %!d(string=hai) anos
pai
achega
852fd13c5c

+ 1 - 0
src/main/java/com/uas/platform/b2c/logistics/model/InvoiceFPurchaseDetail.java

@@ -283,6 +283,7 @@ public class InvoiceFPurchaseDetail {
 		this.remark = puDetail.getRemark();
 		this.goodsnumber = puDetail.getGoodsnumber();
 		this.productid = puDetail.getProductid();
+        this.ordetailid = puDetail.getOrDetailId();
 	}
 
 	/**

+ 1 - 2
src/main/java/com/uas/platform/b2c/prod/commodity/dao/ReleaseProductByBatchDao.java

@@ -95,11 +95,10 @@ public interface ReleaseProductByBatchDao
 	/**
 	 * 批量上架验证数据信息是否重复
 	 * @param batch 本批次代码
-	 * @param isPersonal 是否是个人
 	 * @param enuu 公司enuu
 	 */
 	@Procedure(procedureName = "PRODUCT_RELEASE_EXIST_VALID_V4")
-	void callReleaseExistValidProcedure(String batch, Boolean isPersonal, Long enuu);
+	void callReleaseExistValidProcedure(String batch, Long enuu);
 
 	/**
 	 * 验证器件和品牌的信息pcb

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -286,7 +286,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			}
 		}
 		commonDao.save(releaseProductByBatchs, ReleaseProductByBatch.class);
-        releaseProductByBatchDao.callReleaseExistValidProcedure(batch, isAPerson, enUU);
+        releaseProductByBatchDao.callReleaseExistValidProcedure(batch, enUU);
 		if (isAPerson) {
 			for (ReleaseProductByBatch releaseProductByBatch : releaseProductByBatchs) {
                 Long productid = releaseProductByBatch.getProductid();

+ 1 - 0
src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -2114,6 +2114,7 @@ public class OrderServiceImpl implements OrderService {
     private void setSignReceive(Order order) {
         String inIds = order.getInIds();
         if (StringUtils.isEmpty(inIds)) {
+            order.setSignReceive(Boolean.FALSE);
             return ;
         }
         List<String> inids = new ArrayList<>();