|
|
@@ -856,7 +856,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
if(item.getInventoryCcode()!=null&&item.getInventoryCcode().substring(0,2).equals("04")
|
|
|
&&!item.getInventoryCcode().equals("0499")){
|
|
|
s1.setSupplierCodeDyeingPlant(item.getRSupplierCode());//染厂编码
|
|
|
- s1.setSupplierCodePrintingPlant(item.getSupplierCode());//染厂
|
|
|
+ s1.setSupplierDyeingPlant(item.getRSupplier());//染厂
|
|
|
s1.setSupplierCodePrintingPlant(item.getSupplierCode());//印厂编码
|
|
|
s1.setSupplierPrintingPlant(item.getSupplier());//印厂
|
|
|
}
|
|
|
@@ -2521,7 +2521,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
&&!syShippingDetailsItem.getInventoryCcode().equals("0499")){
|
|
|
//满足条件
|
|
|
sy1.setSupplierCodeDyeingPlant(syShippingDetailsItem.getRSupplierCode());//染厂编码
|
|
|
- sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂
|
|
|
+ sy1.setSupplierDyeingPlant(syShippingDetailsItem.getRSupplier());//染厂
|
|
|
sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//印厂编码
|
|
|
sy1.setSupplierPrintingPlant(syShippingDetailsItem.getSupplier());//印厂
|
|
|
}
|
|
|
@@ -2532,7 +2532,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
sy1.setSupplierDyeingPlant(syShippingDetailsItem.getSupplier());//染厂
|
|
|
}
|
|
|
sy1.setElementsId(elementsId);//申报要素id
|
|
|
- sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
|
|
|
sy1.setOmpoAccount(syShippingDetailsItem.getOmpoAccount());//委外采购账套号
|
|
|
sy1.setOmpoIdItem(syShippingDetailsItem.getOmpoIdItem());//委外采购子表id
|
|
|
sy1.setAccount(syShippingDetailsItem.getAccount());//账套号
|
huxy