Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -438,6 +438,16 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String warehouseNo;
+    /**
+     * 航次
+     */
+    @TableField(exist = false)
+    private String shipNumber;
+    /**
+     * 船名
+     */
+    @TableField(exist = false)
+    private String shipName;
     /**
      *导入
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranSettlementReport.java

@@ -292,6 +292,26 @@ public class TranSettlementReport extends BaseModel<TranSettlementReport> {
     //记录
     @TableField(exist = false)
     private List<TranPriceApprove> tranPriceApproveList;
+    /**
+     * 箱号
+     */
+    @TableField(exist = false)
+    private String caseNo;
+    /**
+     * 箱号2
+     */
+    @TableField(exist = false)
+    private String caseNoOther;
+    /**
+     * 封号
+     */
+    @TableField(exist = false)
+    private String titleNo;
+    /**
+     * 封号2
+     */
+    @TableField(exist = false)
+    private String titleNoOther;
 
 
     @Override

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

@@ -174,6 +174,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             WarehouseInOutInfo warehouseInOutInfo=warehouseInOutInfoService.selectById(qualityInspectionManagement.getWarehouseInOutId());
             if (warehouseInOutInfo!=null){
                 qualityInspectionManagement.setPositionId(warehouseInOutInfo.getPositionId());
+                qualityInspectionManagement.setShipName(warehouseInOutInfo.getShipName());
+                qualityInspectionManagement.setShipNumber(warehouseInOutInfo.getShipNumber());
             }
             //客户信息
             IdentityAuthenticationInfo identityAuthenticationInfo = identityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()

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

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -171,6 +172,10 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 }
                 TranCarInfo tranCarInfo=tranCarInfoService.selectById(tranSettlementReport1.getCarId());
                 if (tranCarInfo!=null){
+                    tranSettlementReport1.setCaseNo(tranCarInfo.getCaseNo());
+                    tranSettlementReport1.setCaseNoOther(tranCarInfo.getCaseNoOther());
+                    tranSettlementReport1.setTitleNo(tranCarInfo.getTitleNo());
+                    tranSettlementReport1.setTitleNoOther(tranCarInfo.getTitleNoOther());
                     if (tranCarInfo.getFleetName()!=null){
                         tranSettlementReport1.setName(tranCarInfo.getFleetName());
                         tranSettlementReport1.setFleetFlag("1");
@@ -249,6 +254,18 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 tranSettlementReport1.setManualFlag("1");
                 //应付=单价x结算重量-扣款
                 tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice() * tranSettlementReport.getSettlementWeight() - Float.valueOf(tranSettlementReport1.getDeductionAmount() != null ? tranSettlementReport1.getDeductionAmount() : "0"));
+                //实付金额
+                tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
+                        - Double.valueOf(tranSettlementReport1.getDeductionAmount() != null ? tranSettlementReport1.getDeductionAmount() : "0") - tranSettlementReport1.getServiceCharge());
+                //税点
+                tranSettlementReport1.setTaxPoint(tranSettlementReport1.getAmountActuallyPaid()/0.946*0.054);
+                //合计应付
+                tranSettlementReport1.setTotalPayable(tranSettlementReport1.getAmountActuallyPaid()+tranSettlementReport1.getTaxPoint());
+                //未付金额
+                Float f = 0.0f;
+                f = tranSettlementReport1.getTotalPayable().floatValue() - tranSettlementReport1.getAmountEdPayable();
+                DecimalFormat df1 = new DecimalFormat("#.00");
+                tranSettlementReport1.setAmountNotPayable(Float.parseFloat(df1.format(f)));
                 //更改汽运结算信息
                 this.updateById(tranSettlementReport1);
                 return "OK";
@@ -258,6 +275,18 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 tranSettlementReport1.setDeductionAmount(tranSettlementReport.getDeductionAmount());
                 tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getSettlementWeight()*tranSettlementReport1.getTransportPrice()-Float.valueOf(tranSettlementReport1.getDeductionAmount()));
                 tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountIngPayable()-tranSettlementReport1.getAmountEdPayable());
+                //实付金额
+                tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
+                        - Double.valueOf(tranSettlementReport1.getDeductionAmount() != null ? tranSettlementReport1.getDeductionAmount() : "0") - tranSettlementReport1.getServiceCharge());
+                //税点
+                tranSettlementReport1.setTaxPoint(tranSettlementReport1.getAmountActuallyPaid()/0.946*0.054);
+                //合计应付
+                tranSettlementReport1.setTotalPayable(tranSettlementReport1.getAmountActuallyPaid()+tranSettlementReport1.getTaxPoint());
+                //未付金额
+                Float f = 0.0f;
+                f = tranSettlementReport1.getTotalPayable().floatValue() - tranSettlementReport1.getAmountEdPayable();
+                DecimalFormat df1 = new DecimalFormat("#.00");
+                tranSettlementReport1.setAmountNotPayable(Float.parseFloat(df1.format(f)));
                 //更改汽运结算信息
                 this.updateById(tranSettlementReport1);
                 return "OK";
@@ -280,17 +309,17 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             else{
                 tranSettlementReport1.setServiceCharge(tranSettlementReport.getServiceCharge());
                 //实付金额
-                if(tranSettlementReport1.getDeductionAmount() != null){
-                    tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
-                            - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport1.getServiceCharge());
-                }else{
-                    tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
-                            - tranSettlementReport1.getServiceCharge());
-                }
+                tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
+                        - Double.valueOf(tranSettlementReport1.getDeductionAmount() != null ? tranSettlementReport1.getDeductionAmount() : "0") - tranSettlementReport1.getServiceCharge());
                 //税点
                 tranSettlementReport1.setTaxPoint(tranSettlementReport1.getAmountActuallyPaid()/0.946*0.054);
                 //合计应付
                 tranSettlementReport1.setTotalPayable(tranSettlementReport1.getAmountActuallyPaid()+tranSettlementReport1.getTaxPoint());
+                //未付金额
+                Float f = 0.0f;
+                f = tranSettlementReport1.getTotalPayable().floatValue() - tranSettlementReport1.getAmountEdPayable();
+                DecimalFormat df1 = new DecimalFormat("#.00");
+                tranSettlementReport1.setAmountNotPayable(Float.parseFloat(df1.format(f)));
                 //更改汽运结算信息
                 this.updateById(tranSettlementReport1);
                 return "OK";
@@ -401,8 +430,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             if (inOutWarehouseTask!=null){
                 if ("销售出库".equals(inOutWarehouseTask.getInOutType())){
                     expenseInfo.setCostType("运费-销售");
-                    expenseInfo.setStatusFlag(StatusEnum.COMPLETED.getFlag());
-                    expenseInfo.setStatus(StatusEnum.COMPLETED.getName());
+                    expenseInfo.setStatusFlag(StatusEnum.COST_PAID.getFlag());
+                    expenseInfo.setStatus(StatusEnum.COST_PAID.getName());
                 }
                 else if ("退库".equals(inOutWarehouseTask.getInOutType())){
                     expenseInfo.setCostType("运费-退库");

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

@@ -325,18 +325,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     }
                     //可超出重量
                     Float overNeight = 0.0f;
-                    ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                            .eq("comp_id", inOutWarehouseTask.getCompId())
-                            .eq("contract_no", inOutWarehouseTask.getContractNo()));
-                    //入库
-                    if (contractManagementInfo != null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
-                        overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
-                    } else {
-                        contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    if("2".equals(inOutWarehouseTask.getInOutFlag())) {
+                        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("comp_id", inOutWarehouseTask.getCompId())
-                                .eq("contract_no", inOutWarehouseTask.getWarehouseName()));
+                                .eq("contract_no", inOutWarehouseTask.getContractNo()));
+                        //入库有合同
+                        if (contractManagementInfo != null) {
+                            overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
+                        }
                         //移库入库
-                        if (contractManagementInfo == null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
+                        else {
                             overNeight = inOutWarehouseTask.getWeight() * 0.08f;
                         }
                     }
@@ -364,18 +362,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 if (inOutWarehouseTask != null) {
                     //可超出重量
                     Float overNeight = 0.0f;
-                    ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                            .eq("comp_id", inOutWarehouseTask.getCompId())
-                            .eq("contract_no", inOutWarehouseTask.getContractNo()));
-                    //入库
-                    if (contractManagementInfo != null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
-                        overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
-                    } else {
-                        contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    if("2".equals(inOutWarehouseTask.getInOutFlag())) {
+                        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("comp_id", inOutWarehouseTask.getCompId())
-                                .eq("contract_no", inOutWarehouseTask.getWarehouseName()));
+                                .eq("contract_no", inOutWarehouseTask.getContractNo()));
+                        //入库有合同
+                        if (contractManagementInfo != null) {
+                            overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
+                        }
                         //移库入库
-                        if (contractManagementInfo == null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
+                        else {
                             overNeight = inOutWarehouseTask.getWeight() * 0.08f;
                         }
                     }
@@ -1495,7 +1491,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setTranType("船运");
                                         tranSettlementReport.setTranTypeKey("3");
                                         tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
-                                        tranSettlementReport.setTaskNo(tranTaskInfo.getTaskNo());
+                                        TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                            .eq("tran_type","3")
+                                            .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                            .eq("ship_no",warehouseInOutInfo.getShipNumber()));
+                                        if (tranCarInfo!=null){
+                                            TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                            if (tranTaskInfo1!=null){
+                                                tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                            }
+                                        }
                                     }
                                     tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                                     tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -1671,7 +1676,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranSettlementReport.setTranType("船运");
                                 tranSettlementReport.setTranTypeKey("3");
                                 tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
-                                tranSettlementReport.setTaskNo(warehouseInOutInfo.getTaskNo());
+                                TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                        .eq("tran_type","3")
+                                        .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                        .eq("ship_no",warehouseInOutInfo.getShipNumber()));
+                                if (tranCarInfo!=null){
+                                    TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                    if (tranTaskInfo1!=null){
+                                        tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                    }
+                                }
                             }
                             tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                             tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -2192,7 +2206,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReport.setTranType("船运");
                             tranSettlementReport.setTranTypeKey("3");
                             tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
-                            tranSettlementReport.setTaskNo(warehouseInOutInfo.getTaskNo());
+                            TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                    .eq("tran_type","3")
+                                    .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                    .eq("ship_no",warehouseInOutInfo.getShipNumber()));
+                            if (tranCarInfo!=null){
+                                TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                if (tranTaskInfo1!=null){
+                                    tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                }
+                            }
                         }
                         tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                         tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -2915,22 +2938,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     }
                     //可超出重量
                     Float overNeight = 0.0f;
-                    ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                            .eq("comp_id", inOutWarehouseTask.getCompId())
-                            .eq("contract_no", inOutWarehouseTask.getContractNo()));
-                    //出入库有合同
-                    if (contractManagementInfo != null) {
-                        overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
-                    }
-                    //出库无合同情况
-                    else if (contractManagementInfo == null &&"1".equals(inOutWarehouseTask.getInOutFlag())) {
-                        overNeight = inOutWarehouseTask.getWeight() * 0.05f;
-                    } else {
-                        contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    if("2".equals(inOutWarehouseTask.getInOutFlag())) {
+                        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("comp_id", inOutWarehouseTask.getCompId())
-                                .eq("contract_no", inOutWarehouseTask.getWarehouseName()));
+                                .eq("contract_no", inOutWarehouseTask.getContractNo()));
+                        //入库有合同
+                        if (contractManagementInfo != null) {
+                            overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
+                        }
                         //移库入库
-                        if (contractManagementInfo == null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
+                        else {
                             overNeight = inOutWarehouseTask.getWeight() * 0.08f;
                         }
                     }
@@ -2970,22 +2987,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     }
                     //可超出重量
                     Float overNeight = 0.0f;
-                    ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                            .eq("comp_id", inOutWarehouseTask.getCompId())
-                            .eq("contract_no", inOutWarehouseTask.getContractNo()));
-                    //出入库有合同
-                    if (contractManagementInfo != null) {
-                        overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
-                    }
-                    //出库无合同情况
-                    else if (contractManagementInfo == null &&"1".equals(inOutWarehouseTask.getInOutFlag())) {
-                        overNeight = inOutWarehouseTask.getWeight() * 0.05f;
-                    } else {
-                        contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    if("2".equals(inOutWarehouseTask.getInOutFlag())) {
+                        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("comp_id", inOutWarehouseTask.getCompId())
-                                .eq("contract_no", inOutWarehouseTask.getWarehouseName()));
+                                .eq("contract_no", inOutWarehouseTask.getContractNo()));
+                        //入库有合同
+                        if (contractManagementInfo != null) {
+                            overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
+                        }
                         //移库入库
-                        if (contractManagementInfo == null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
+                        else {
                             overNeight = inOutWarehouseTask.getWeight() * 0.08f;
                         }
                     }
@@ -3537,79 +3548,84 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                             //船运移库入库生成汽运报表
                             if ("散船".equals(warehouseInOutInfo.getOutType())||"集装箱船".equals(warehouseInOutInfo.getOutType())) {
-                                TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
-                                        .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                        .eq("comp_id", warehouseBaseInfo.getCompId()));
-                                if (tranTaskInfo != null) {
-                                    TranProcessInfo tranProcessInfo = tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
-                                            .eq("info_id", tranTaskInfo.getId()));
-                                    if (tranProcessInfo != null) {
-                                        //自运出库时手动加的车
-                                        if ("1".equals(warehouseInOutInfo.getSelfLoading()) || warehouseInOutInfo.getCarId() == null) {
-                                            List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                                    .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1"));
-                                            TranCarInfo tranCarInfo = new TranCarInfo();
-                                            tranCarInfo.setProcessId(tranProcessInfo.getId());
-                                            tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
-                                            tranCarInfo.setInfoId(tranTaskInfo.getId());
-                                            tranCarInfo.setCompId(warehouseBaseInfo.getCompId());
-                                            tranCarInfo.setTranType("1");
-                                            tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
-                                            String tranCarNo = "";
-                                            if ((tranCarInfoList.size() + 1) < 10) {
-                                                tranCarNo = "C00" + (tranCarInfoList.size() + 1);
-                                            } else if (tranCarInfoList.size() + 1 < 100) {
-                                                tranCarNo = "C0" + (tranCarInfoList.size() + 1);
-                                            } else {
-                                                tranCarNo = "C" + (tranCarInfoList.size() + 1);
+                                TranCarInfo tranCarInfo1=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                        .eq("tran_type","3")
+                                        .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                        .eq("ship_no",warehouseInOutInfo.getShipNumber()));
+                                if (tranCarInfo1!=null){
+                                    TranTaskInfo tranTaskInfo=tranTaskInfoService.selectById(tranCarInfo1.getInfoId());
+                                    if (tranTaskInfo!=null){
+                                        TranProcessInfo tranProcessInfo = tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
+                                                .eq("info_id", tranTaskInfo.getId()));
+                                        if (tranProcessInfo != null) {
+                                            //自运出库时手动加的车
+                                            if ("1".equals(warehouseInOutInfo.getSelfLoading()) || warehouseInOutInfo.getCarId() == null) {
+                                                List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                                                        .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1"));
+                                                TranCarInfo tranCarInfo = new TranCarInfo();
+                                                tranCarInfo.setProcessId(tranProcessInfo.getId());
+                                                tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
+                                                tranCarInfo.setInfoId(tranTaskInfo.getId());
+                                                tranCarInfo.setCompId(warehouseBaseInfo.getCompId());
+                                                tranCarInfo.setTranType("1");
+                                                tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                                                String tranCarNo = "";
+                                                if ((tranCarInfoList.size() + 1) < 10) {
+                                                    tranCarNo = "C00" + (tranCarInfoList.size() + 1);
+                                                } else if (tranCarInfoList.size() + 1 < 100) {
+                                                    tranCarNo = "C0" + (tranCarInfoList.size() + 1);
+                                                } else {
+                                                    tranCarNo = "C" + (tranCarInfoList.size() + 1);
+                                                }
+                                                tranCarInfo.setTranCarNo(tranCarNo);
+                                                tranCarInfo.setId(IdGenerator.generateUUID());
+                                                tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
+                                                tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                                                tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                                                if ("散船".equals(warehouseInOutInfo.getOutType())) {
+                                                    tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
+                                                    tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
+                                                } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
+                                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                                }
+                                                warehouseInOutInfo.setCarId(tranCarInfo.getId());
+                                                warehouseInOutInfo.setTranCarNo(tranCarNo);
+                                                warehouseInOutInfoService.updateById(warehouseInOutInfo);
+                                                tranCarInfoService.insert(tranCarInfo);
                                             }
-                                            tranCarInfo.setTranCarNo(tranCarNo);
-                                            tranCarInfo.setId(IdGenerator.generateUUID());
-                                            tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
-                                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
-                                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
-                                            if ("散船".equals(warehouseInOutInfo.getOutType())) {
-                                                tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
-                                                tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
-                                            } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
-                                                tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
-                                                tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                            //生成船运报表
+                                            TranSettlementReport tranSettlementReport = new TranSettlementReport();
+                                            tranSettlementReport.setCompId(warehouseBaseInfo.getCompId());
+                                            tranSettlementReport.setCarId(warehouseInOutInfo.getCarId());
+                                            tranSettlementReport.setId(IdGenerator.generateUUID());
+                                            tranSettlementReport.setTranType("船运");
+                                            tranSettlementReport.setTranTypeKey("3");
+                                            tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                                            tranSettlementReport.setTaskNo(tranTaskInfo.getTaskNo());
+                                            tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
+                                            tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
+                                            tranSettlementReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
+                                            tranSettlementReport.setStartAddress(inOutWarehouseTask.getWarehouseName());
+                                            tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                            //运输单价不为空
+                                            if (tranProcessInfo.getTranPrice() != null) {
+                                                //应付
+                                                tranSettlementReport.setAmountIngPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                                //未付
+                                                tranSettlementReport.setAmountNotPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                                tranSettlementReport.setTransportPrice(Float.valueOf(tranProcessInfo.getTranPrice()));
                                             }
-                                            warehouseInOutInfo.setCarId(tranCarInfo.getId());
-                                            warehouseInOutInfo.setTranCarNo(tranCarNo);
-                                            warehouseInOutInfoService.updateById(warehouseInOutInfo);
-                                            tranCarInfoService.insert(tranCarInfo);
+                                            tranSettlementReport.setUnloadingImg(warehouseInOutInfo.getAddressUrl());
+                                            tranSettlementReport.setUnloadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                            tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                                            tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
+                                            tranSettlementReportService.insert(tranSettlementReport);
                                         }
-                                        //生成汽运报表
-                                        TranSettlementReport tranSettlementReport = new TranSettlementReport();
-                                        tranSettlementReport.setCompId(warehouseBaseInfo.getCompId());
-                                        tranSettlementReport.setCarId(warehouseInOutInfo.getCarId());
-                                        tranSettlementReport.setId(IdGenerator.generateUUID());
-                                        tranSettlementReport.setTranType("船运");
-                                        tranSettlementReport.setTranTypeKey("3");
-                                        tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
-                                        tranSettlementReport.setTaskNo(tranTaskInfo.getTaskNo());
-                                        tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
-                                        tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
-                                        tranSettlementReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
-                                        tranSettlementReport.setStartAddress(inOutWarehouseTask.getWarehouseName());
-                                        tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-                                        //运输单价不为空
-                                        if (tranProcessInfo.getTranPrice() != null) {
-                                            //应付
-                                            tranSettlementReport.setAmountIngPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
-                                            //未付
-                                            tranSettlementReport.setAmountNotPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
-                                            tranSettlementReport.setTransportPrice(Float.valueOf(tranProcessInfo.getTranPrice()));
-                                        }
-                                        tranSettlementReport.setUnloadingImg(warehouseInOutInfo.getAddressUrl());
-                                        tranSettlementReport.setUnloadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-                                        tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
-                                        tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
-                                        tranSettlementReportService.insert(tranSettlementReport);
                                     }
-                                } else {
-                                    throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
+                                    else {
+                                        throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
+                                    }
                                 }
                             }
                         }
@@ -4262,7 +4278,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setTranType("船运");
                                         tranSettlementReport.setTranTypeKey("3");
                                         tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
-                                        tranSettlementReport.setTaskNo(tranTaskInfo.getTaskNo());
+                                        TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                                .eq("tran_type","3")
+                                                .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                                .eq("ship_no",warehouseInOutInfo.getShipNumber()));
+                                        if (tranCarInfo!=null){
+                                            TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                            if (tranTaskInfo1!=null){
+                                                tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                            }
+                                        }
                                     }
                                     tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                                     tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -4454,7 +4479,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranSettlementReport.setTranType("船运");
                                 tranSettlementReport.setTranTypeKey("3");
                                 tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
-                                tranSettlementReport.setTaskNo(warehouseInOutInfo.getTaskNo());
+                                TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                        .eq("tran_type","3")
+                                        .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                        .eq("ship_no",warehouseInOutInfo.getShipNumber()));
+                                if (tranCarInfo!=null){
+                                    TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                    if (tranTaskInfo1!=null){
+                                        tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                    }
+                                }
                             }
                             tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                             tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -5043,7 +5077,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReport.setTranType("船运");
                             tranSettlementReport.setTranTypeKey("3");
                             tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
-                            tranSettlementReport.setTaskNo(warehouseInOutInfo.getTaskNo());
+                            TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                    .eq("tran_type","3")
+                                    .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                    .eq("ship_no",warehouseInOutInfo.getShipNumber()));
+                            if (tranCarInfo!=null){
+                                TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                if (tranTaskInfo1!=null){
+                                    tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                }
+                            }
                         }
                         tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                         tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());

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

@@ -558,7 +558,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                     .eq("comp_id", warehousingOrder2.getCompId())
                                     .eq("contract_no", warehousingOrder2.getContractNo())
                                     .eq("delete_flag", "0"));
-                            warehousingOrder.setGoodsSource(inOutWarehouseTask.getWarehouseName());
+                            warehousingOrder.setGoodsSource(warehousingOrder2.getGoodsSource());
                             //更新收货库库点库存 (所在仓库为入货库、所属仓库为原始货源仓库、货名一致)
                             ContractInventoryDistribution contractInventoryDistribution=contractInventoryDistributionService.selectOne(new EntityWrapper<ContractInventoryDistribution>()
                                     .eq("comp_id",warehousingOrder1.getCompId()).eq("inventory_type","3").eq("locus_warehouse",warehousingOrder1.getWarehouseName())
@@ -591,6 +591,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                 contractInventoryDistributionService.updateById(contractInventoryDistribution1);
                             }
                         }
+                        else if ("移库入库".equals(warehousingOrder2.getInType())){
+                            warehousingOrder.setGoodsSource(warehousingOrder2.getGoodsSource());
+                        }
                         this.insert(warehousingOrder);
                     }
                 }
@@ -1571,7 +1574,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             //查询详细数据
             Map<String, Object> pageView1 = new HashMap<>();
             //  关联ID
-            pageView1.put("batchId", warehousingOrder1.getId());
+            pageView1.put("batchId", warehousingOrder1.getBatchId());
             // 查询付款数据
             List<PaymentManagement> dataList1 = baseMapper.getListByConditionOut(pageView1);
             if(!CollectionUtils.isEmpty(dataList1)){
@@ -1585,6 +1588,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder1.setImpurity(dataList1.get(j).getImpurity());
                     warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
                     warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
+                    warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
                     if("潮粮".contains(dataList1.get(j).getGoodsName())){
                         //单价=（潮粮单价-扣单价）*1000
                         warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice()-dataList1.get(j).getUnitDeduction())*1000);

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

@@ -1202,22 +1202,12 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 .eq("in_out_task_no",weighingManagementList.get(0).getInOutTaskNo()));
         //合计净重
         double weight = weighingManagementList.stream().mapToDouble(WeighingManagement::getNetWeight).sum();
-        //可超出重量
-        Float overNeight = 0.0f;
         //更新任务完成量
         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                 .eq("comp_id", inOutWarehouseTask.getCompId())
                 .eq("contract_no", inOutWarehouseTask.getContractNo()));
-        //出入库有合同
-        if (contractManagementInfo != null) {
-            overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
-        }
-        //出库无合同情况
-        else {
-            overNeight = inOutWarehouseTask.getWeight() * 0.05f;
-        }
         inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + weight);
-        if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
+        if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight()) {
             throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
         } else {
             inOutWarehouseTaskService.updateById(inOutWarehouseTask);

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -65,6 +65,7 @@
         w.amount_not_payable as amountNotPayable,
         w.contract_no as contractNo,
         w.goods_name as goodsName,
+        w.car_no as carNo,
         w.request_funds as requestFunds,
         w.request_person as requestPerson,
         w.request_date as requestDate,