|
|
|
@ -1604,7 +1604,8 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
item0.setSettlement(model.getSettlement());
|
|
|
|
|
//rate税率:默认为0 即13个点
|
|
|
|
|
item0.setRate("0");
|
|
|
|
|
|
|
|
|
|
// 单位
|
|
|
|
|
item0.setUnit(model.getUnit());
|
|
|
|
|
//amount金额:price*settlement,保留6位小数
|
|
|
|
|
item0.setAmount(new BigDecimal(model.getSalesPrice()));
|
|
|
|
|
//not_amount不含税金额:price*settlement*(1 - 税率) 不含税价格为sum/1.13=price
|
|
|
|
@ -1644,10 +1645,20 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
|
|
|
|
|
// 合同id
|
|
|
|
|
entity.setContractCode(contractMEntities.get(0).getId());
|
|
|
|
|
// 合同名称
|
|
|
|
|
// entity.setContractName(contractMEntities.get(0).getContractName());
|
|
|
|
|
// 来源系统
|
|
|
|
|
entity.setSourceSystem("0");
|
|
|
|
|
// 是否结算
|
|
|
|
|
entity.setIsSettle("0");
|
|
|
|
|
//是否转销售
|
|
|
|
|
entity.setIsSettle("0");
|
|
|
|
|
// 是否付款申请
|
|
|
|
|
entity.setIsPayment("0");
|
|
|
|
|
// 对方合同号
|
|
|
|
|
entity.setContractNo(contractMEntities.get(0).getContractNo());
|
|
|
|
|
// 供应商、客户ID
|
|
|
|
|
// entity.setSupplierId(contractMEntities.get(0).getCode());
|
|
|
|
|
entity.setSupplierId(contractMEntities.get(0).getCode());
|
|
|
|
|
// 供应商名称
|
|
|
|
|
entity.setSupplierName(contractMEntities.get(0).getName());
|
|
|
|
|
// 重量
|
|
|
|
@ -1683,7 +1694,6 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
// 生成的榜单编码
|
|
|
|
|
ActionResult pdBillNumber = bean.getBillNumber(str1);
|
|
|
|
|
model.setPoundlistNo(String.valueOf(pdBillNumber.getData()));
|
|
|
|
|
|
|
|
|
|
model.setSupplierName(contractMEntities.get(0).getName());
|
|
|
|
|
// 车辆信息
|
|
|
|
|
model.setVehiclePictures(purchaseorderDTO.getCarPictures());
|
|
|
|
@ -1698,6 +1708,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
model.setIsExamine("1");
|
|
|
|
|
// 榜单类型
|
|
|
|
|
model.setPoundType("0");
|
|
|
|
|
model.setPurchaseStatus("0");
|
|
|
|
|
// 业务员默认当前操作人
|
|
|
|
|
String userId = userProvider.get().getUserId();
|
|
|
|
|
model.setBusinessId(userId);
|
|
|
|
@ -1708,9 +1719,9 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
|
|
|
|
|
//进行数据添加
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int insert = purchaseorderitemMapper.insert(purEntities);
|
|
|
|
|
for (int i = 0; i < purItemEntities.size(); i++) {
|
|
|
|
|
|
|
|
|
|
Purchaseorder_item0Entity entity = purItemEntities.get(i);
|
|
|
|
|
purchaseorderItem0Mapper.insert(entity);
|
|
|
|
|
}
|
|
|
|
|