1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -1132,7 +1132,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     contractManagementInfo1.setCompletedQuantity(outWeight - returnWeight);
                 }
                 //现货他运采购合同
-                else if ("1".equals(contractManagementInfo1.getGoodsType()) && "2".equals(contractManagementInfo1.getDeliverType()) && "2".equals(contractManagementInfo1.getContractType())) {
+                else if ("1".equals(contractManagementInfo1.getGoodsType()) && ("2".equals(contractManagementInfo1.getDeliverType())||"3".equals(contractManagementInfo1.getDeliverType()) )&& "2".equals(contractManagementInfo1.getContractType())) {
                     //定义出库量
                     Double inWeight = 0.0d;
                     //查询同合同编号入库量