|
|
@@ -346,6 +346,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
else {
|
|
|
//App端入库关联派车表
|
|
|
if ("0".equals(warehouseInOutInfo.getPcFlag())&&"入库任务".equals(warehouseInOutInfo.getTaskType())) {
|
|
|
+ warehouseInOutInfo.setInOutDate(warehouseInOutInfo.getUpdateDate());
|
|
|
TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
|
|
|
.eq("contract_no", warehouseInOutInfo.getContractNo())
|
|
|
.eq("car_no", warehouseInOutInfo.getCarNo())
|
|
|
@@ -419,6 +420,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
else if ("0".equals(warehouseInOutInfo.getPcFlag())&&"出库任务".equals(warehouseInOutInfo.getTaskType())) {
|
|
|
//状态改为已发车
|
|
|
warehouseInOutInfo.setTranFlag("1");
|
|
|
+ warehouseInOutInfo.setInOutDate(warehouseInOutInfo.getUpdateDate());
|
|
|
//客户生成收货信息
|
|
|
TranCarInfo tranCarInfo=new TranCarInfo();
|
|
|
tranCarInfo.setId(IdGenerator.generateUUID());
|
|
|
@@ -432,7 +434,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
SaleOrder saleOrder = saleOrderService.selectOne(new EntityWrapper<SaleOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
|
|
|
.eq("delete_flag", "0"));
|
|
|
if (saleOrder != null) {
|
|
|
- tranCarInfo.setSettlementPrice(warehouseInOutInfo.getUnitPrice() + saleOrder.getBasis() + saleOrder.getInvoiceFee());
|
|
|
+ tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice() + saleOrder.getBasis() + saleOrder.getInvoiceFee());
|
|
|
}
|
|
|
tranCarInfoService.insert(tranCarInfo);
|
|
|
//判断是否第一次提交
|
zhangyuewww