Browse Source

面辅料账套号查询

huxy 2 years ago
parent
commit
cc63df3c0e

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -152,8 +152,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
-            System.out.println("string\t"+syPreAssembledPackingListVo.getIsReference());
-            System.out.println("boolean\t"+syPreAssembledPackingListVo.getIsReference().equals(0));
             if(syPreAssembledPackingListVo.getIsReference().equals(0)){
                 queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
             }else{

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -121,7 +121,7 @@ public class SyPackingListFabricController {
 		}
 
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getAccount())){
-			queryWrapper.like("a.account",syPackingListFabric.getAccount());//账套号
+			queryWrapper.like("b.account",syPackingListFabric.getAccount());//账套号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getIsReference())){
 			if(syPackingListFabric.getIsReference().equals(0)){

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -1485,8 +1485,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							}
 							sy1.setElementsId(elementsId);//申报要素id
 							sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
-							sy1.setOmpoAccount(syShippingDetailsItem.getOmpoAccount());//账套号
+							sy1.setOmpoAccount(syShippingDetailsItem.getOmpoAccount());//委外采购账套号
 							sy1.setOmpoIdItem(syShippingDetailsItem.getOmpoIdItem());//委外采购子表id
+							sy1.setAccount(syShippingDetailsItem.getAccount());//账套号
 							sy1.setOmpoId(syShippingDetailsItem.getOmpoId());//委外采购主表id
 							sy1.setPurOrSubOrder(syShippingDetailsItem.getPurOrSubOrder());//委外采购订单号
 							sy1.setSupplierCode(syShippingDetailsItem.getSupplierCode());//供应商