2024年1月9日18:00:11

blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/AccountsServiceImpl.java

@@ -117,6 +117,7 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 			accounts.setIsDetail(1);
 		}
 		this.saveOrUpdate(accounts);
+
 		if (ObjectUtils.isNotNull(accounts.getAccItemsOpenblcList())) {
 			for (AccItemsOpenblc item : accounts.getAccItemsOpenblcList()) {
 				item.setAccountCode(accounts.getCode());
@@ -136,7 +137,7 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 				item.setCurCode(accounts.getCurCode());
 				item.setExrate(accounts.getExrate());
 				item.setUnitNo(accounts.getUnitNo());
-				item.setPrice(accounts.getPrice());
+//				item.setPrice(accounts.getPrice());
 				if (item.getId() == null) {
 					item.setCreateTime(new Date());
 					item.setCreateUser(AuthUtil.getUserId());

blade-service/blade-los/src/main/java/org/springblade/los/edi/dto/APLSoDto.java

@@ -0,0 +1,778 @@
+package org.springblade.los.edi.dto;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springblade.los.edi.entity.EdiTypes;
+
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+
+/**
+ * @author :jixinyuan
+ * @date : 2023/12/20
+ */
+@Data
+public class APLSoDto {
+
+
+	/* 00  */
+	/**
+	 * 报文类型
+	 */
+	@NotEmpty(message = "报文类型不能为空")
+	@Length(min = 1, max = 6, message = "报文类型不能超过6字符")
+	private String messageType = "IFTMBF";
+	/**
+	 * 文件说明
+	 */
+	@Length(min = 1, max = 6, message = "文件说明不能超过35字符")
+	private String fileDescription;
+	/**
+	 * 文件功能
+	 */
+	@NotEmpty(message = "文件功能不能为空")
+	@Length(min = 1, max = 2, message = "文件功能不能超过2字符")
+	private String fileFunction;
+	/**
+	 * 发送方代码
+	 */
+	@NotEmpty(message = "发送方代码不能为空")
+	@Length(min = 1, max = 13, message = "发送方代码不能超过13字符")
+	private String senderCode;
+	/**
+	 * 接收方代码
+	 */
+	@NotEmpty(message = "接收方代码不能为空")
+	@Length(min = 1, max = 13, message = "接收方代码不能超过13字符")
+	private String receiverCode;
+	/**
+	 * 文件建立时间
+	 */
+	@NotEmpty(message = "文件建立时间不能为空")
+	@Length(min = 1, max = 12, message = "文件建立时间不能超过12字符")
+	private String filesEstablishTime;
+
+	/* 02  */
+	/**
+	 * 运编号
+	 */
+	@NotEmpty(message = "运编号不能为空")
+	@Length(min = 1, max = 20, message = "运编号不能超过20字符")
+	private String operationNumber;
+	/**
+	 * 提单号
+	 */
+	@Length(min = 1, max = 20, message = "提单号不能超过20字符")
+	private String billNo;
+	/**
+	 * 交货条款
+	 */
+	@NotEmpty(message = "交货条款不能为空")
+	@Length(min = 1, max = 9, message = "交货条款不能超过9字符")
+	private String deliveryTerms;
+	/**
+	 * 订舱人说明
+	 */
+	@NotEmpty(message = "订舱人说明不能为空")
+	@Length(min = 1, max = 70, message = "订舱人说明不能超过70字符")
+	private String bookerExplain;
+	/**
+	 * 签单人代码
+	 */
+	@NotEmpty(message = "签单人代码不能为空")
+	@Length(min = 1, max = 13, message = "签单人代码不能超过13字符")
+	private String signerCode;
+	/**
+	 * 签单人说明
+	 */
+	@Length(min = 1, max = 35, message = "签单人说明不能超过35字符")
+	private String signerExplain;
+	/**
+	 * 询价单位
+	 */
+	@Length(min = 1, max = 13, message = "询价单位不能超过13字符")
+	private String inquiryParty;
+	/**
+	 * 国外订舱单位
+	 */
+	@Length(min = 1, max = 13, message = "国外订舱单位不能超过13字符")
+	private String abroadBookingParty;
+	/**
+	 * 转船标识
+	 */
+	@Length(min = 1, max = 1, message = "转船标识不能超过1字符")
+	private String transshipmentIdentification;
+	/**
+	 * 分批
+	 */
+	@Length(min = 1, max = 1, message = "分批不能超过1字符")
+	private String inBatches;
+	/**
+	 * 装期
+	 */
+	@Length(min = 1, max = 8, message = "装期不能超过8为")
+	private Integer installationPeriod;
+	/**
+	 * 效期
+	 */
+	@Length(min = 1, max = 8, message = "效期不能超过8为")
+	private Integer validityPeriod;
+	/**
+	 * 运费协议号
+	 */
+	@Length(min = 1, max = 30, message = "运费协议号不能超过30字符")
+	private String freightAgreementNumber;
+	/**
+	 * 费率本代码
+	 */
+	@Length(min = 1, max = 1, message = "费率本代码不能超过1字符")
+	private String rateBookCode;
+	/**
+	 * 服务合同号
+	 */
+	@Length(min = 1, max = 15, message = "服务合同号不能超过15字符")
+	private String serviceContractNumber;
+	/**
+	 * bondNo
+	 */
+	@Length(min = 1, max = 15, message = "bondNo不能超过15字符")
+	private String bondNo;
+	/**
+	 * 舱位互用标识
+	 */
+	@Length(min = 1, max = 1, message = "舱位互用标识不能超过1字符")
+	private String cabinInteroperabilityIdentification;
+
+	/* 03  */
+	/**
+	 * 提单类型
+	 */
+	@NotEmpty(message = "提单类型不能为空")
+	@Length(min = 1, max = 4, message = "提单类型不能超过4字符")
+	private String billOfLadingType;
+	/**
+	 * 提单签发地代码
+	 */
+	@Length(min = 1, max = 5, message = "提单签发地代码不能超过5字符")
+	private String billOfLadingIssuingPlaceCode;
+	/**
+	 * 提单签发地
+	 */
+	@Length(min = 1, max = 35, message = "提单签发地不能超过35字符")
+	private String billOfLadingIssuingPlace;
+	/**
+	 * 签发日期
+	 */
+	@Length(min = 1, max = 8, message = "签发日期不能超过8字符")
+	private Integer issuanceDate;
+	/**
+	 * 正本提单份数
+	 */
+	@NotEmpty(message = "正本提单份数不能为空")
+	@Length(min = 1, max = 2, message = "正本提单份数不能超过2字符")
+	private Integer numberOfOriginalBillsOfLading;
+	/**
+	 * 预付地点
+	 */
+	@Length(min = 1, max = 35, message = "预付地点不能超过35字符")
+	private String prepaidAt;
+	/**
+	 * 到付地点
+	 */
+	@Length(min = 1, max = 35, message = "到付地点不能超过35字符")
+	private String payableAt;
+
+	/* 11  */
+	/**
+	 * 船舶呼号
+	 */
+	@Length(min = 1, max = 9, message = "船舶呼号不能超过9字符")
+	private String vesselCallSign;
+	/**
+	 * 船名
+	 */
+	@Length(min = 1, max = 35, message = "船名不能超过35字符")
+	private String vesselName;
+	/**
+	 * 航次
+	 */
+	@Length(min = 1, max = 10, message = "航次不能超过10字符")
+	private String voyage;
+	/**
+	 * 船舶经营人代码
+	 */
+	@Length(min = 1, max = 13, message = "船舶经营人代码不能超过13字符")
+	private String vesselOperatorCode;
+	/**
+	 * 船舶经营人
+	 */
+	@Length(min = 1, max = 35, message = "船舶经营人不能超过35字符")
+	private String vesselOperator;
+	/**
+	 * 提单承运人代码
+	 */
+	@Length(min = 1, max = 13, message = "提单承运人代码不能超过13字符")
+	private String billCarryCode;
+	/**
+	 * 提单承运人
+	 */
+	@Length(min = 1, max = 35, message = "提单承运人不能超过35字符")
+	private String billCarry;
+	/**
+	 * 要求装运日期
+	 */
+	@Length(min = 1, max = 8, message = "要求装运日期不能超过8字符")
+	private Integer requestShipmentDate;
+	/**
+	 * 航线代码
+	 */
+	@Length(min = 1, max = 10, message = "航线代码不能超过10字符")
+	private String tradeCode;
+	/**
+	 * 航线
+	 */
+	@Length(min = 1, max = 35, message = "航线不能超过35字符")
+	private String trade;
+	/**
+	 * 前程运输船名代码
+	 */
+	@Length(min = 1, max = 9, message = "前程运输船名代码不能超过9字符")
+	private String preVesselCode;
+	/**
+	 * 前程运输船名
+	 */
+	@Length(min = 1, max = 35, message = "前程运输船名不能超过35字符")
+	private String preVessel;
+	/**
+	 * 前程运输航次
+	 */
+	@Length(min = 1, max = 6, message = "前程运输航次不能超过6字符")
+	private String preVoyage;
+
+	/* 12  */
+	/**
+	 * 收货地代码
+	 */
+	@Length(min = 1, max = 5, message = "收货地代码不能超过5字符")
+	private String placeCodeOfReceipt;
+	/**
+	 * 收货地
+	 */
+	@Length(min = 1, max = 35, message = "收货地不能超过35字符")
+	private String placeOfReceipt;
+	/**
+	 * 装货港代码
+	 */
+	@Length(min = 1, max = 5, message = "装货港代码不能超过5字符")
+	private String loadPortCode;
+	/**
+	 * 装货港
+	 */
+	@Length(min = 1, max = 35, message = "装货港不能超过35字符")
+	private String loadPort;
+	/**
+	 * 卸货港代码
+	 */
+	@NotEmpty(message = "卸货港代码不能为空")
+	@Length(min = 1, max = 5, message = "卸货港代码不能超过5字符")
+	private String dischargePortCode;
+	/**
+	 * 卸货港
+	 */
+	@Length(min = 1, max = 35, message = "卸货港不能超过35字符")
+	private String dischargePort;
+	/**
+	 * 中转港代码
+	 */
+	@Length(min = 1, max = 5, message = "中转港代码不能超过5字符")
+	private String transFerportCode;
+	/**
+	 * 中转港
+	 */
+	@Length(min = 1, max = 35, message = "中转港不能超过35字符")
+	private String transFerport;
+	/**
+	 * 交货地代码
+	 */
+	@Length(min = 1, max = 5, message = "交货地代码不能超过5字符")
+	private String placeoFdeliveryCode;
+	/**
+	 * 交货地
+	 */
+	@Length(min = 1, max = 35, message = "交货地不能超过35字符")
+	private String placeoFdelivery;
+	/**
+	 * 目的地代码
+	 */
+	@Length(min = 1, max = 5, message = "目的地代码不能超过5字符")
+	private String finalDestinationCode;
+	/**
+	 * 目的地
+	 */
+	@Length(min = 1, max = 35, message = "目的地不能超过35字符")
+	private String finalDestination;
+	/**
+	 * 堆场代码
+	 */
+	@Length(min = 1, max = 5, message = "堆场代码不能超过5字符")
+	private String depotCode;
+
+	/* 13  */
+	/**
+	 * 可选卸货港代码
+	 */
+	@Length(min = 1, max = 5, message = "可选卸货港代码不能超过5字符")
+	private String optDischPortCode;
+	/**
+	 * 可选卸货港
+	 */
+	@Length(min = 1, max = 35, message = "可选卸货港不能超过35字符")
+	private String optDischPort;
+	/**
+	 * CODE可选交货地代码
+	 */
+	@Length(min = 1, max = 5, message = "CODE可选交货地代码不能超过5字符")
+	private String optPlaceOfDeliveryCode;
+	/**
+	 * 可选交货地
+	 */
+	@Length(min = 1, max = 70, message = "可选交货地不能超过70字符")
+	private String optPlaceOfDelivery;
+
+	/* 14  */
+	/**
+	 * 运费条款代码
+	 */
+	@Length(min = 1, max = 3, message = "运费条款代码不能超过3字符")
+	private String frClauseCode;
+	/**
+	 * 运费条款
+	 */
+	@NotEmpty(message = "运费条款不能为空")
+	@Length(min = 1, max = 40, message = "运费条款不能超过40字符")
+	private String frEightClause;
+
+	/* 15  */
+	/**
+	 * 运费及费用代码
+	 */
+	@Length(min = 1, max = 3, message = "运费及费用代码不能超过3字符")
+	private String frChCode;
+	/**
+	 * 运费及费用说明
+	 */
+	@Length(min = 1, max = 35, message = "运费及费用说明不能超过35字符")
+	private String frChRemark;
+	/**
+	 * 付款方式
+	 */
+	@NotEmpty(message = "付款方式不能为空")
+	@Length(min = 1, max = 1, message = "付款方式不能超过1字符")
+	private String prepaidOrCollect;
+	/**
+	 * 第三地付款地点代码
+	 */
+	@Length(min = 1, max = 5, message = "第三地付款地点代码不能超过5字符")
+	private String payableAtE;
+	/**
+	 * 收款人代码
+	 */
+	@Length(min = 1, max = 13, message = "收款人代码不能超过13字符")
+	private String payeeCode;
+	/**
+	 * 数量
+	 */
+	@Length(min = 1, max = 10, message = "数量不能超过10字符")
+	private String quantity;
+	/**
+	 * 币种
+	 */
+	@Length(min = 1, max = 3, message = "币种不能超过3字符")
+	private String currency;
+	/**
+	 * 费率
+	 */
+	@Length(min = 1, max = 10, message = "费率不能超过10字符")
+	private String rateOfFrCh;
+	/**
+	 * 数量单位
+	 */
+	@Length(min = 1, max = 3, message = "数量单位不能超过3字符")
+	private String unitOfQuantity;
+	/**
+	 * 金额
+	 */
+	@Length(min = 1, max = 10, message = "金额不能超过10字符")
+	private String amount;
+
+	/* 17  */
+	/**
+	 * 备注
+	 */
+	@NotEmpty(message = "备注不能为空")
+	@Length(min = 1, max = 10, message = "备注不能超过10字符")
+	private String remarks;
+	/*币种*/
+	/**
+	 * 货物金额
+	 */
+	@Length(min = 1, max = 10, message = "货物金额不能超过10字符")
+	private String cargoAmount;
+	/**
+	 * 装箱方式
+	 */
+	@Length(min = 1, max = 10, message = "装箱方式不能超过10字符")
+	private String modeOfStuffing;
+
+	/* 20  */
+	/**
+	 * 发货人代码
+	 */
+	@Length(min = 1, max = 13, message = "发货人代码不能超过13字符")
+	private String shipperCode;
+	/**
+	 * 发货人
+	 */
+	@Length(min = 1, max = 35, message = "发货人不能超过35字符")
+	private String shipper;
+
+	/* 21  */
+	/**
+	 * 收货人代码
+	 */
+	@Length(min = 1, max = 13, message = "收货人代码不能超过13字符")
+	private String consigneeCode;
+	/**
+	 * 收货人
+	 */
+	@Length(min = 1, max = 35, message = "收货人不能超过35字符")
+	private String consignee;
+
+	/* 22  */
+	/**
+	 * 通知人代码
+	 */
+	@Length(min = 1, max = 13, message = "通知人代码不能超过13字符")
+	private String notifyCode;
+	/**
+	 * 通知人
+	 */
+	@Length(min = 1, max = 35, message = "通知人不能超过35字符")
+	private String notify;
+
+	/* 23  */
+	/**
+	 * 通知人代码
+	 */
+	@Length(min = 1, max = 13, message = "通知人代码不能超过13字符")
+	private String alsoNotifyCode;
+	/**
+	 * 第三方通知人
+	 */
+	@Length(min = 1, max = 35, message = "第三方通知人不能超过35字符")
+	private String alsoNotify;
+
+	/* 41  */
+	/**
+	 * 货物序号
+	 */
+	@NotEmpty(message = "货物序号不能为空")
+	@Length(min = 1, max = 3, message = "货物序号不能超过3字符")
+	private Integer cargoSequenceNo;
+	/**
+	 * 货类代码
+	 */
+	@Length(min = 1, max = 1, message = "货类代码不能超过1字符")
+	private String cargoCode;
+	/**
+	 * 货物标识
+	 */
+	@NotEmpty(message = "货物标识不能为空")
+	@Length(min = 1, max = 35, message = "货物标识不能超过35字符")
+	private String cargoId;
+	/**
+	 * 第一层包装件数
+	 */
+	@NotEmpty(message = "第一层包装件数不能为空")
+	@Length(min = 1, max = 6, message = "第一层包装件数不能超过6字符")
+	private Integer numbersOfPkgs;
+	/**
+	 * 第一层包装类型
+	 */
+	@NotEmpty(message = "第一层包装类型不能为空")
+	@Length(min = 1, max = 2, message = "第一层包装类型不能超过2字符")
+	private String codeOfPkgs;
+	/**
+	 * 第一层包装说明
+	 */
+	@NotEmpty(message = "第一层包装说明不能为空")
+	@Length(min = 1, max = 35, message = "第一层包装说明不能超过35字符")
+	private String packagesDes;
+	/**
+	 * 第一层包装皮重
+	 */
+	@NotEmpty(message = "第一层包装皮重不能为空")
+	@Length(min = 1, max = 18, message = "第一层包装皮重不能超过18字符")
+	private BigDecimal cargoGrossWt;
+	/**
+	 * 第一层包装尺码
+	 */
+	@NotEmpty(message = "第一层包装尺码不能为空")
+	@Length(min = 1, max = 18, message = "第一层包装尺码不能超过18字符")
+	private BigDecimal cargoMeasurement;
+	/**
+	 * 第二层包装件数
+	 */
+	@Length(min = 1, max = 6, message = "第二层包装件数不能超过6字符")
+	private BigDecimal numbersOfPackages;
+	/**
+	 * 第二层包装类型
+	 */
+	@Length(min = 1, max = 2, message = "第二层包装类型不能超过2字符")
+	private String codeOfPkgs2;
+	/**
+	 * 第二层包装说明
+	 */
+	@Length(min = 1, max = 35, message = "第二层包装说明不能超过35字符")
+	private String packagesDes2;
+	/**
+	 * 第二层包装皮重
+	 */
+	@Length(min = 1, max = 18, message = "第二层包装皮重不能超过18字符")
+	private BigDecimal cargoGrossWt2;
+	/**
+	 * 第二层包装尺码
+	 */
+	@Length(min = 1, max = 18, message = "第二层包装尺码不能超过18字符")
+	private BigDecimal cargoMeasurement2;
+	/**
+	 * 货毛重
+	 */
+	@Length(min = 1, max = 18, message = "货毛重不能超过18字符")
+	private BigDecimal cargoGrossWeight;
+	/**
+	 * 货净重
+	 */
+	@Length(min = 1, max = 18, message = "货净重不能超过18字符")
+	private BigDecimal cargoNetWeight;
+	/**
+	 * 检疫代码
+	 */
+	@Length(min = 1, max = 1, message = "检疫代码不能超过1字符")
+	private String quarantineCodingCode;
+	/**
+	 * 检疫名称
+	 */
+	@Length(min = 1, max = 35, message = "检疫名称不能超过35字符")
+	private String quarantineCoding;
+
+	/* 43  */
+	/**
+	 * 危险品分类
+	 */
+	@Length(min = 1, max = 5, message = "危险品分类不能超过5字符")
+	private String dgClass;
+	/**
+	 * 危险品页号
+	 */
+	@Length(min = 1, max = 7, message = "危险品页号不能超过7字符")
+	private String page;
+	/**
+	 * 联合国危险品编号
+	 */
+	@Length(min = 1, max = 4, message = "联合国危险品编号不能超过4字符")
+	private Integer undgNo;
+	/**
+	 * 危险品标签
+	 */
+	@Length(min = 1, max = 32, message = "危险品标签不能超过32字符")
+	private String label;
+	/**
+	 * 危险货物闪点
+	 */
+	@Length(min = 1, max = 5, message = "危险货物闪点不能超过5字符")
+	private String flashPoint;
+	/**
+	 * 船运危险品应急措施号
+	 */
+	@Length(min = 1, max = 6, message = "船运危险品应急措施号不能超过6字符")
+	private String emsNo;
+	/**
+	 * 医疗急救指南号
+	 */
+	@Length(min = 1, max = 4, message = "医疗急救指南号不能超过4字符")
+	private String mfagNo;
+	/**
+	 * 海运污染
+	 */
+	@Length(min = 1, max = 1, message = "海运污染不能超过1字符")
+	private String mptMarinePollutant;
+	/**
+	 * 应急联系
+	 */
+	@Length(min = 1, max = 35, message = "应急联系不能超过35字符")
+	private String emergencyContact;
+	/**
+	 * 冷藏通风量
+	 */
+	@Length(min = 1, max = 3, message = "冷藏通风量不能超过3字符")
+	private String reeferVentilationFlux;
+	/**
+	 * 温度计量单位
+	 */
+	@Length(min = 1, max = 1, message = "温度计量单位不能超过1字符")
+	private String temperatureId;
+	/**
+	 * 设置温度
+	 */
+	@Length(min = 1, max = 5, message = "设置温度不能超过5字符")
+	private String temperatureSetting;
+	/**
+	 * 冷藏最低温度
+	 */
+	@Length(min = 1, max = 5, message = "冷藏最低温度不能超过5字符")
+	private String minTemperature;
+	/**
+	 * 冷藏最高温度
+	 */
+	@Length(min = 1, max = 5, message = "冷藏最高温度不能超过5字符")
+	private String maxTemperature;
+	/**
+	 * 前超
+	 */
+	@Length(min = 1, max = 4, message = "前超不能超过4字符")
+	private Integer overLengthFront;
+	/**
+	 * 后超
+	 */
+	@Length(min = 1, max = 4, message = "后超不能超过4字符")
+	private Integer overLengthBack;
+	/**
+	 * 左超
+	 */
+	@Length(min = 1, max = 4, message = "左超不能超过4字符")
+	private Integer overWidthLeft;
+	/**
+	 * 右超
+	 */
+	@Length(min = 1, max = 4, message = "右超不能超过4字符")
+	private Integer overWidthRight;
+	/**
+	 * 超高
+	 */
+	@Length(min = 1, max = 4, message = "超高不能超过4字符")
+	private Integer overHeight;
+
+	/* 44  */
+	/**
+	 * 唛头
+	 */
+	@NotEmpty(message = "唛头不能为空")
+	@Length(min = 1, max = 35, message = "唛头不能超过35字符")
+	private String marks;
+
+	/* 47  */
+	/**
+	 * 货物描述
+	 */
+	@NotEmpty(message = "货物描述不能为空")
+	@Length(min = 1, max = 70, message = "货物描述不能超过70字符")
+	private String cargoDescription;
+
+	/* 48  */
+	/**
+	 * 集装箱尺寸类型
+	 */
+	@NotEmpty(message = "集装箱尺寸类型不能为空")
+	@Length(min = 1, max = 4, message = "集装箱尺寸类型不能超过4字符")
+	private String ctnSizeType;
+	/**
+	 * 集装箱箱数
+	 */
+	@NotEmpty(message = "集装箱箱数不能为空")
+	@Length(min = 1, max = 6, message = "集装箱箱数不能超过6字符")
+	private Integer ctnNumbers;
+	/**
+	 * 集装箱状态
+	 */
+	@NotEmpty(message = "集装箱状态不能为空")
+	@Length(min = 1, max = 1, message = "集装箱状态不能超过1字符")
+	private String ctnStatus;
+	/**
+	 * 主拼号
+	 */
+	@Length(min = 1, max = 20, message = "主拼号不能超过20字符")
+	private String masterLclNo;
+	/**
+	 * 装箱方式
+	 */
+	@Length(min = 1, max = 35, message = "装箱方式不能超过35字符")
+	private String cntModeOfStuffing;
+	/**
+	 * 装箱地点代码
+	 */
+	@Length(min = 1, max = 13, message = "装箱地点代码不能超过13字符")
+	private String vanningDepotCode;
+	/**
+	 * 装箱地点说明
+	 */
+	@Length(min = 1, max = 35, message = "装箱地点说明不能超过35字符")
+	private String vanningDepot;
+	/**
+	 * 货主箱标志
+	 */
+	@NotEmpty(message = "货主箱标志不能为空")
+	@Length(min = 1, max = 1, message = "货主箱标志不能超过1字符")
+	private String containerSoc;
+
+	/* 51  */
+	/**
+	 * 箱号
+	 */
+	@NotEmpty(message = "箱号不能为空")
+	@Length(min = 1, max = 4, message = "箱号不能超过4字符")
+	private String ctnNo;
+	/**
+	 * 箱型尺寸
+	 */
+	@NotEmpty(message = "箱型尺寸不能为空")
+	@Length(min = 1, max = 20, message = "箱型尺寸不能超过20字符")
+	private String ctnTypeSize;
+	/**
+	 * 铅封号
+	 */
+	@NotEmpty(message = "铅封号不能为空")
+	@Length(min = 1, max = 4, message = "铅封号不能超过4字符")
+	private String sealNo;
+	/**
+	 * 箱内货物件数
+	 */
+	@NotEmpty(message = "箱内货物件数不能为空")
+	@Length(min = 1, max = 6, message = "箱内货物件数不能超过6字符")
+	private Integer ctnNumbersOfPackages;
+	/**
+	 * 箱内货重
+	 */
+	@NotEmpty(message = "箱内货重不能为空")
+	@Length(min = 1, max = 18, message = "箱内货重不能超过18字符")
+	private BigDecimal ctnCargoNetWeight;
+	/**
+	 * 箱皮重
+	 */
+	@Length(min = 1, max = 18, message = "箱皮重不能超过18字符")
+	private BigDecimal cargoTareWeight;
+
+	/* 99  */
+	/**
+	 * 记录总数
+	 */
+	@NotEmpty(message = "记录总数不能为空")
+	@Length(min = 1, max = 6, message = "记录总数不能超过6字符")
+	private Integer recordTotalOfFile;
+
+	/**
+	 * edi发送地址
+	 */
+	private EdiTypes ediTypes;
+
+}

blade-service/blade-los/src/main/java/org/springblade/los/edi/service/impl/EdiTypesServiceImpl.java

@@ -38,6 +38,7 @@ import org.springblade.los.business.sea.entity.Containers;
 import org.springblade.los.business.sea.service.IBillsService;
 import org.springblade.los.business.sea.service.IContainersService;
 import org.springblade.los.edi.api.EDISender;
+import org.springblade.los.edi.dto.APLSoDto;
 import org.springblade.los.edi.dto.InttraSiBillDto;
 import org.springblade.los.edi.dto.InttraSiDto;
 import org.springblade.los.edi.dto.InttraSoDto;
@@ -813,6 +814,200 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			}
 			billsService.updateBatchById(billsList);
 		}
+		else if ("HYCK".equals(ediTypes.getType()) && "APL-SO".equals(ediTypes.getCode())) {
+			Date date = new Date();
+			for (Bills details : billsList) {
+				APLSoDto aplSoDto = new APLSoDto();
+
+				FilesCenter filesCenter = EDISender.sendingAplSo(aplSoDto);
+
+				//发送edi记录
+				EdiLog ediLog = new EdiLog();
+				ediLog.setBillId(details.getId());
+				ediLog.setBillNo(details.getBillNo());
+				ediLog.setMblno(details.getMblno());
+				ediLog.setHblno(details.getHblno());
+				ediLog.setPid(ediTypes.getId());
+				ediLog.setSenderDate(new Date());
+				ediLog.setBranchId(details.getBranchId());
+				ediLog.setCreateDept(details.getCreateDept());
+				ediLog.setCreateTime(details.getCreateTime());
+				ediLog.setCreateDeptName(details.getCreateDeptName());
+				ediLog.setCreateUser(details.getCreateUser());
+				ediLog.setCreateUserName(details.getCreateUserName());
+				ediLog.setRemarks("发送成功");
+				ediLog.setStatus(1);
+				ediLogService.save(ediLog);
+
+				//发送edi文件
+				filesCenter.setMblno(details.getMblno());
+				filesCenter.setHblno(details.getHblno());
+				filesCenter.setBillNo(details.getBillNo());
+				filesCenter.setBranchId(details.getBranchId());
+				filesCenter.setCreateDept(details.getCreateDept());
+				filesCenter.setCreateTime(details.getCreateTime());
+				filesCenter.setCreateDeptName(details.getCreateDeptName());
+				filesCenter.setCreateUser(details.getCreateUser());
+				filesCenter.setCreateUserName(details.getCreateUserName());
+				filesCenter.setPid(details.getId());
+				filesCenter.setItemId(ediLog.getId());
+				filesCenter.setBusinessType(details.getBusinessType());
+				filesCenter.setClassifyCode("edi");
+				filesCenter.setGroupCode("SI");
+				filesCenter.setSerialNo(1);
+				filesCenter.setSort(1);
+				filesCenter.setReceivedData(new Date());
+				filesCenter.setIsImage(0);
+				filesCenter.setTenantId(AuthUtil.getTenantId());
+				filesCenterList.add(filesCenter);
+			}
+			billsService.updateBatchById(billsList);
+		}
+		else if ("HYCK".equals(ediTypes.getType()) && "APL-SI".equals(ediTypes.getCode())) {
+			Date date = new Date();
+			for (Bills details : billsList) {
+				InttraSiBillDto inttraSoDto = new InttraSiBillDto();
+				inttraSoDto.setIdentifying("发送方标识");
+				SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd:hhmm");
+				inttraSoDto.setDate(sdf.format(date));
+				SimpleDateFormat sdf1 = new SimpleDateFormat("yyMMddhhmm");
+				String corpId = details.getCorpId().toString();
+				inttraSoDto.setFileExchangeNumber(sdf1.format(date) + corpId.substring(corpId.length() - 4));
+				inttraSoDto.setInformationNo(inttraSoDto.getFileExchangeNumber());
+
+				details.setMblno(RegularUtils.regularEn(details.getMblno()));
+				inttraSoDto.setIdentificationCode(details.getMblno());
+
+				if (ObjectUtils.isNotNull(details.getEdiStatus()) && Integer.parseInt(details.getEdiStatus()) > 0) {
+					inttraSoDto.setFilesFunction("5");
+					details.setEdiStatus(Integer.parseInt(details.getEdiStatus()) + 1 + "");
+				} else {
+					inttraSoDto.setFilesFunction("9");
+					details.setEdiStatus("1");
+				}
+				inttraSoDto.setFilesDate(sdf1.format(date));
+
+				details.setServiceTerms(RegularUtils.regularEn(details.getServiceTerms()));
+				inttraSoDto.setTransportTermCode(details.getServiceTerms());
+
+				inttraSoDto.setLclType("2");
+
+				details.setRemarks(RegularUtils.regularEn(details.getRemarks()));
+				inttraSoDto.setRemarks(details.getRemarks());
+
+				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyymmdd");
+				if (ObjectUtils.isNotNull(details.getIssueDate())) {
+					inttraSoDto.setIssueDate(sdf2.format(details.getIssueDate()));
+				}
+
+				details.setRefno(RegularUtils.regularEn(details.getRefno()));
+				inttraSoDto.setBillNo(details.getRefno());
+
+				inttraSoDto.setPaymentType(details.getMpaymode());
+
+				details.setVoyageNo(RegularUtils.regularEn(details.getVoyageNo()));
+				inttraSoDto.setVoyageNo(details.getVoyageNo());
+				if (ObjectUtils.isNotNull(details.getVesselId())) {
+					BVessels bVessels = bVesselsService.getById(details.getVesselId());
+					if (bVessels != null) {
+						BCorps bCorps = bCorpsService.getById(bVessels.getCarrierId());
+						if (bCorps != null) {
+							bCorps.setCarrierCode(RegularUtils.regularEn(bCorps.getCarrierCode()));
+							inttraSoDto.setVesselCarrierCode(bCorps.getCarrierCode());
+						}
+					}
+				}
+
+				details.setVesselCnName(RegularUtils.regularEn(details.getVesselCnName()));
+				inttraSoDto.setVesselName(details.getVesselCnName());
+
+				inttraSoDto.setBillLadingType("提单类型");
+				if (details.getStlCrStatus() >= 3 || details.getStlDrStatus() >= 3) {
+					inttraSoDto.setPaymentStatus("已付款");
+				} else {
+					inttraSoDto.setPaymentStatus("未付款");
+				}
+				inttraSoDto.setBillLadingNumber(new BigDecimal("0"));
+				inttraSoDto.setPackagesNumbers(details.getQuantity());
+				inttraSoDto.setPackagesCode(details.getPackingUnit());
+				inttraSoDto.setPackagesDescribe("包装描述");
+				inttraSoDto.setHsCode(new BigDecimal("001"));
+
+				inttraSoDto.setMarks(details.getMarks());
+				BigDecimal boxGoodNumber = new BigDecimal("0.00");
+				if (containersList.size() > 0) {
+					inttraSoDto.setBoxGoodNumber(containersList.get(0).getQuantity());
+
+					String boxNumber = containersList.stream().map(Containers::getCntrNo).filter(Objects::nonNull).distinct().collect(Collectors.joining("/"));
+					inttraSoDto.setBoxNo(boxNumber);
+					inttraSoDto.setShipperBoxIdentification("货主箱标识");
+
+				} else {
+					inttraSoDto.setBoxGoodNumber(boxGoodNumber);
+				}
+				details.setDgImdgCode(RegularUtils.regularEn(details.getDgImdgCode()));
+				inttraSoDto.setDgImdgCode(details.getDgImdgCode());
+				inttraSoDto.setPageNumber(new BigDecimal("007"));
+				inttraSoDto.setDgUnCode(1);
+				inttraSoDto.setDgFlashPoint(new BigDecimal("1"));
+				inttraSoDto.setDgFlashPointUnit(details.getDgFlashPointUnit());
+				inttraSoDto.setPackingGroup("包装组别");
+				inttraSoDto.setEmergencyMeasureNo("应急措施号");
+				details.setDgRemarks(RegularUtils.regularEn(details.getDgRemarks()));
+				inttraSoDto.setDgRemarks(details.getDgRemarks());
+				inttraSoDto.setDgContacts(details.getDgContacts());
+				inttraSoDto.setDgTel(details.getDgTel());
+				inttraSoDto.setBoxCode(details.getQuantityCntrDescr());
+				inttraSoDto.setTemperature(1);
+				inttraSoDto.setTemperatureUnit("温度单位");
+				inttraSoDto.setRecordRows(new BigDecimal("10"));
+				inttraSoDto.setInformationNoEnd(inttraSoDto.getInformationNo());
+				inttraSoDto.setFileExchangeNumberEnd(inttraSoDto.getFileExchangeNumber());
+
+				FilesCenter filesCenter = EDISender.sendingInttraSiBill(inttraSoDto);
+
+				//发送edi记录
+				EdiLog ediLog = new EdiLog();
+				ediLog.setBillId(details.getId());
+				ediLog.setBillNo(details.getBillNo());
+				ediLog.setMblno(details.getMblno());
+				ediLog.setHblno(details.getHblno());
+				ediLog.setPid(ediTypes.getId());
+				ediLog.setSenderDate(new Date());
+				ediLog.setBranchId(details.getBranchId());
+				ediLog.setCreateDept(details.getCreateDept());
+				ediLog.setCreateTime(details.getCreateTime());
+				ediLog.setCreateDeptName(details.getCreateDeptName());
+				ediLog.setCreateUser(details.getCreateUser());
+				ediLog.setCreateUserName(details.getCreateUserName());
+				ediLog.setRemarks("发送成功");
+				ediLog.setStatus(1);
+				ediLogService.save(ediLog);
+
+				//发送edi文件
+				filesCenter.setMblno(details.getMblno());
+				filesCenter.setHblno(details.getHblno());
+				filesCenter.setBillNo(details.getBillNo());
+				filesCenter.setBranchId(details.getBranchId());
+				filesCenter.setCreateDept(details.getCreateDept());
+				filesCenter.setCreateTime(details.getCreateTime());
+				filesCenter.setCreateDeptName(details.getCreateDeptName());
+				filesCenter.setCreateUser(details.getCreateUser());
+				filesCenter.setCreateUserName(details.getCreateUserName());
+				filesCenter.setPid(details.getId());
+				filesCenter.setItemId(ediLog.getId());
+				filesCenter.setBusinessType(details.getBusinessType());
+				filesCenter.setClassifyCode("edi");
+				filesCenter.setGroupCode("SI");
+				filesCenter.setSerialNo(1);
+				filesCenter.setSort(1);
+				filesCenter.setReceivedData(new Date());
+				filesCenter.setIsImage(0);
+				filesCenter.setTenantId(AuthUtil.getTenantId());
+				filesCenterList.add(filesCenter);
+			}
+			billsService.updateBatchById(billsList);
+		}
 		filesCenterService.saveOrUpdateBatch(filesCenterList);
 		return R.data("发送成功");
 	}

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -701,9 +701,9 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 				item.setUpdateUser(AuthUtil.getUserId());
 				item.setUpdateUserName(AuthUtil.getUserName());
 				if ("USD".equals(item.getCurCode())) {
-					amount = amount.add(item.getAmount().multiply(finInvoices.getExrate()));
+					amount = amount.add(item.getCurrentAmount().multiply(finInvoices.getExrate()));
 				} else {
-					amount = amount.add(item.getAmount());
+					amount = amount.add(item.getCurrentAmount());
 				}
 			}
 			finInvoiceItemDetail.setAmount(amount);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -18,34 +18,34 @@ package org.springblade.salesPart.brand.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.salesPart.brand.service.IBrandDescService;
 import org.springblade.salesPart.brand.service.IBrandFilesService;
-import org.springblade.salesPart.entity.*;
+import org.springblade.salesPart.entity.PjBrandDesc;
+import org.springblade.salesPart.entity.PjBrandFiles;
+import org.springblade.salesPart.entity.PjGoodsDesc;
 import org.springblade.salesPart.goods.service.IGoodsDescService;
+import org.springblade.salesPart.vo.BrandDescVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.salesPart.vo.BrandDescVO;
-import org.springblade.salesPart.brand.service.IBrandDescService;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -95,12 +95,7 @@ public class BrandDescController extends BladeController {
 			lambdaQueryWrapper.ge(PjBrandDesc::getCreateTime, brandDesc.getCreateTimeList().get(0));
 			lambdaQueryWrapper.le(PjBrandDesc::getCreateTime, brandDesc.getCreateTimeList().get(1));
 		}
-		if (ObjectUtils.isNotNull(brandDesc.getType()) && !"PP".equals(brandDesc.getType())){
-			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-				lambdaQueryWrapper.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
-			}
-		}
-
+		lambdaQueryWrapper.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		lambdaQueryWrapper.orderByDesc(PjBrandDesc::getSort);
 		IPage<PjBrandDesc> pages = brandDescService.page(Condition.getPage(query), lambdaQueryWrapper);
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditPathsActsController.java

@@ -25,20 +25,17 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.check.entity.AuditPaths;
-import org.springblade.check.entity.AuditPathsActs;
-import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.salesPart.check.entity.PjAuditPaths;
 import org.springblade.salesPart.check.entity.PjAuditPathsActs;
 import org.springblade.salesPart.check.entity.PjAuditPathsLevels;
 import org.springblade.salesPart.check.service.IAuditPathsActsService;
 import org.springblade.salesPart.check.service.IAuditPathsLevelsService;
 import org.springblade.salesPart.check.service.IAuditPathsService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -65,22 +62,18 @@ public class AuditPathsActsController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "列表-审批流配置明细表", notes = "传入auditPathsActs")
-	public R<IPage<PjAuditPathsActs>> list(PjAuditPathsActs auditPathsActs, Query query)
-	{
-		LambdaQueryWrapper<PjAuditPathsActs> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+	public R<IPage<PjAuditPathsActs>> list(PjAuditPathsActs auditPathsActs, Query query) {
+		LambdaQueryWrapper<PjAuditPathsActs> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjAuditPathsActs::getTenantId, AuthUtil.getTenantId());
-		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPathsActs.getActName()),PjAuditPathsActs::getActName,auditPathsActs.getActName());
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			lambdaQueryWrapper.eq(PjAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId());//公司
-		}
+		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPathsActs.getActName()), PjAuditPathsActs::getActName, auditPathsActs.getActName());
+		lambdaQueryWrapper.eq(PjAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		IPage<PjAuditPathsActs> pages = auditPathsActsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		List<PjAuditPathsActs> records = pages.getRecords();
-		if(CollectionUtils.isNotEmpty(records))
-		{
-			records.forEach(e->{
+		if (CollectionUtils.isNotEmpty(records)) {
+			records.forEach(e -> {
 				Long pathId = e.getPathId();
 				PjAuditPaths auditPaths = pathsService.getById(pathId);
-                e.setPathName(auditPaths.getPathName());
+				e.setPathName(auditPaths.getPathName());
 			});
 		}
 		return R.data(pages);
@@ -89,10 +82,8 @@ public class AuditPathsActsController extends BladeController {
 	@PostMapping("modify")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "保存-审批流配置明细表", notes = "传入auditPathsActs")
-	public R modify(@RequestBody List<PjAuditPathsActs> auditPathsActsList)
-	{
-		if(CollectionUtils.isEmpty(auditPathsActsList))
-		{
+	public R modify(@RequestBody List<PjAuditPathsActs> auditPathsActsList) {
+		if (CollectionUtils.isEmpty(auditPathsActsList)) {
 			throw new SecurityException("传入数据为空");
 		}
 		auditPathsActsService.modify(auditPathsActsList);
@@ -102,30 +93,29 @@ public class AuditPathsActsController extends BladeController {
 	@GetMapping("listLevelsByActId")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "feign接口专用,前端勿调", notes = "feign接口专用,前端勿调")
-    public List<PjAuditPathsLevels> listLevelsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus)
-	{
-		PjAuditPathsActs pathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<PjAuditPathsActs>().eq(PjAuditPathsActs::getActId, actId).eq(PjAuditPathsActs::getFidStatus,fidStatus).eq(PjAuditPathsActs::getTenantId,AuthUtil.getTenantId()));
+	public List<PjAuditPathsLevels> listLevelsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus) {
+		PjAuditPathsActs pathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<PjAuditPathsActs>().eq(PjAuditPathsActs::getActId, actId).eq(PjAuditPathsActs::getFidStatus, fidStatus).eq(PjAuditPathsActs::getTenantId, AuthUtil.getTenantId()));
 		Long pathId = pathsActs.getPathId();
-		List<PjAuditPathsLevels> levelsList = auditPathsLevelsService.list(new LambdaQueryWrapper<PjAuditPathsLevels>().eq(PjAuditPathsLevels::getTenantId,AuthUtil.getTenantId()).eq(PjAuditPathsLevels::getPathId, pathId));
+		List<PjAuditPathsLevels> levelsList = auditPathsLevelsService.list(new LambdaQueryWrapper<PjAuditPathsLevels>().eq(PjAuditPathsLevels::getTenantId, AuthUtil.getTenantId()).eq(PjAuditPathsLevels::getPathId, pathId));
 		return levelsList;
 	}
 
 	@GetMapping("getActsByActId")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "feign接口专用,前端勿调", notes = "feign接口专用,前端勿调")
-	public PjAuditPathsActs getActsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId,@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus)
-	{
-		LambdaQueryWrapper<PjAuditPathsActs> auditPathsActsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+	public PjAuditPathsActs getActsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus) {
+		LambdaQueryWrapper<PjAuditPathsActs> auditPathsActsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		auditPathsActsLambdaQueryWrapper
-			.eq(PjAuditPathsActs::getIsEnable,1)
-			.eq(PjAuditPathsActs::getFidStatus,fidStatus)
-			.eq(PjAuditPathsActs::getTenantId,AuthUtil.getTenantId())
-			.eq(PjAuditPathsActs::getActId,actId);
-	return 	auditPathsActsService.getOne(auditPathsActsLambdaQueryWrapper);
+			.eq(PjAuditPathsActs::getIsEnable, 1)
+			.eq(PjAuditPathsActs::getFidStatus, fidStatus)
+			.eq(PjAuditPathsActs::getTenantId, AuthUtil.getTenantId())
+			.eq(PjAuditPathsActs::getActId, actId);
+		return auditPathsActsService.getOne(auditPathsActsLambdaQueryWrapper);
 	}
 
 	/**
 	 * 根据租户获取审批流信息
+	 *
 	 * @param actId
 	 * @param fidStatus
 	 * @return
@@ -134,31 +124,29 @@ public class AuditPathsActsController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "feign接口专用,前端勿调", notes = "feign接口专用,前端勿调")
 	public List<PjAuditPathsLevels> listApproval(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus
-		, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String tenantId)
-	{
-		return auditPathsActsService.listApproval(actId,fidStatus,tenantId);
+		, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String tenantId) {
+		return auditPathsActsService.listApproval(actId, fidStatus, tenantId);
 	}
+
 	@GetMapping("/getApprovalActId")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "feign接口专用,前端勿调", notes = "feign接口专用,前端勿调")
 	public PjAuditPathsActs getApprovalActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId,
-										   @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus,
-		 @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String tenantId)
-	{
-		return 	auditPathsActsService.getApprovalActId(actId,fidStatus,tenantId);
+											 @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus,
+											 @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String tenantId) {
+		return auditPathsActsService.getApprovalActId(actId, fidStatus, tenantId);
 	}
 
 
-
 	/**
 	 * 详情
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入auditPathsActs")
-	public R<AuditPathsActs> detail(AuditPathsActs auditPathsActs) {
-		AuditPathsActs detail = auditPathsActsService.getOne(Condition.getQueryWrapper(auditPathsActs));
-		return R.data(detail);
-	}*/
+	 @GetMapping("/detail")
+	 @ApiOperationSupport(order = 1)
+	 @ApiOperation(value = "详情", notes = "传入auditPathsActs")
+	 public R<AuditPathsActs> detail(AuditPathsActs auditPathsActs) {
+	 AuditPathsActs detail = auditPathsActsService.getOne(Condition.getQueryWrapper(auditPathsActs));
+	 return R.data(detail);
+	 }*/
 
 	/**
 	 * 分页 审批流配置明细表
@@ -167,33 +155,33 @@ public class AuditPathsActsController extends BladeController {
 
 	/**
 	 * 自定义分页 审批流配置明细表
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入auditPathsActs")
-	public R<IPage<AuditPathsActsVO>> page(AuditPathsActsVO auditPathsActs, Query query) {
-		IPage<AuditPathsActsVO> pages = auditPathsActsService.selectAuditPathsActsPage(Condition.getPage(query), auditPathsActs);
-		return R.data(pages);
-	}
-    */
+	 @GetMapping("/page")
+	 @ApiOperationSupport(order = 3)
+	 @ApiOperation(value = "分页", notes = "传入auditPathsActs")
+	 public R<IPage<AuditPathsActsVO>> page(AuditPathsActsVO auditPathsActs, Query query) {
+	 IPage<AuditPathsActsVO> pages = auditPathsActsService.selectAuditPathsActsPage(Condition.getPage(query), auditPathsActs);
+	 return R.data(pages);
+	 }
+	 */
 	/**
 	 * 新增 审批流配置明细表
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入auditPathsActs")
-	public R save(@Valid @RequestBody AuditPathsActs auditPathsActs) {
-		return R.status(auditPathsActsService.save(auditPathsActs));
-	}*/
+	 @PostMapping("/save")
+	 @ApiOperationSupport(order = 4)
+	 @ApiOperation(value = "新增", notes = "传入auditPathsActs")
+	 public R save(@Valid @RequestBody AuditPathsActs auditPathsActs) {
+	 return R.status(auditPathsActsService.save(auditPathsActs));
+	 }*/
 
 	/**
 	 * 修改 审批流配置明细表
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入auditPathsActs")
-	public R update(@Valid @RequestBody AuditPathsActs auditPathsActs) {
-		return R.status(auditPathsActsService.updateById(auditPathsActs));
-	}
-
-	*//**
+	 @PostMapping("/update")
+	 @ApiOperationSupport(order = 5)
+	 @ApiOperation(value = "修改", notes = "传入auditPathsActs")
+	 public R update(@Valid @RequestBody AuditPathsActs auditPathsActs) {
+	 return R.status(auditPathsActsService.updateById(auditPathsActs));
+	 }
+
+	 *//**
 	 * 新增或修改 审批流配置明细表
 	 *//*
 	@PostMapping("/submit")

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditPathsController.java

@@ -87,29 +87,24 @@ public class AuditPathsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "列表-审批流配置主表", notes = "传入auditPaths")
 	public R<IPage<PjAuditPaths>> list(PjAuditPaths auditPaths, Query query) {
-		LambdaQueryWrapper<PjAuditPaths> lambdaQueryWrapper=new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPaths.getPathName()),PjAuditPaths::getPathName,auditPaths.getPathName())
+		LambdaQueryWrapper<PjAuditPaths> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPaths.getPathName()), PjAuditPaths::getPathName, auditPaths.getPathName())
 			.eq(PjAuditPaths::getTenantId, AuthUtil.getTenantId())
 			.orderByDesc(PjAuditPaths::getOpDate);
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			lambdaQueryWrapper.eq(PjAuditPaths::getSalesCompanyId, AuthUtil.getDeptId());//公司
-		}
-		IPage<PjAuditPaths> pages = auditPathsService.page(Condition.getPage(query),lambdaQueryWrapper);
+		lambdaQueryWrapper.eq(PjAuditPaths::getSalesCompanyId, AuthUtil.getDeptId());//公司
+		IPage<PjAuditPaths> pages = auditPathsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 
 	/**
-	 *  新增或编辑-审批流配置
-	 * */
-	 @PostMapping("/modify")
-	 @ApiOperationSupport(order = 3)
-	 @ApiOperation(value = "新增或编辑-审批流配置", notes = "传入auditPaths")
-		public R modify(@RequestBody PjAuditPaths auditPaths)
-	 {
-			return R.data(auditPathsService.modify(auditPaths));
-	 }
-
-
+	 * 新增或编辑-审批流配置
+	 */
+	@PostMapping("/modify")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "新增或编辑-审批流配置", notes = "传入auditPaths")
+	public R modify(@RequestBody PjAuditPaths auditPaths) {
+		return R.data(auditPathsService.modify(auditPaths));
+	}
 
 
 	/**
@@ -121,13 +116,12 @@ public class AuditPathsController extends BladeController {
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		//todo 有进行中的禁止删除
 		List<Long> pathIds = Func.toLongList(ids);
-		pathIds.forEach(e->{
-			LambdaQueryWrapper<PjAuditPathsActs> lambdaQueryWrapper=new LambdaQueryWrapper<>();
-			lambdaQueryWrapper.eq(PjAuditPathsActs::getTenantId,AuthUtil.getTenantId())
-				.eq(PjAuditPathsActs::getPathId,e);
+		pathIds.forEach(e -> {
+			LambdaQueryWrapper<PjAuditPathsActs> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(PjAuditPathsActs::getTenantId, AuthUtil.getTenantId())
+				.eq(PjAuditPathsActs::getPathId, e);
 			PjAuditPathsActs pathsActs = auditPathsActsService.getOne(lambdaQueryWrapper);
-			if(pathsActs!=null)
-			{
+			if (pathsActs != null) {
 				throw new SecurityException("审批已被使用无法删除");
 			}
 		});
@@ -137,6 +131,7 @@ public class AuditPathsController extends BladeController {
 
 	/**
 	 * 获得所有类型
+	 *
 	 * @param auditPaths 审批流配置类
 	 */
 	@GetMapping("/typeList")
@@ -149,7 +144,7 @@ public class AuditPathsController extends BladeController {
 		List<PjAuditPaths> list = auditPathsService.list(lambdaQueryWrapper);
 		List<PjAuditPaths> pathsList = new ArrayList<>();
 		//根据类型去重
-		if (ObjectUtil.isNotEmpty(list)){
+		if (ObjectUtil.isNotEmpty(list)) {
 			pathsList = list.stream().collect(Collectors.collectingAndThen(
 				Collectors.toCollection(() -> new TreeSet<>(
 					Comparator.comparing(PjAuditPaths::getBusinessType))), ArrayList::new));
@@ -159,20 +154,21 @@ public class AuditPathsController extends BladeController {
 
 	/**
 	 * 根据类型获得所有审批名称
+	 *
 	 * @param auditPaths 审批流配置类
 	 */
 	@GetMapping("/pathNameList")
 	@ApiOperation(value = "获得审批名称", notes = "传入auditPaths")
 	public R<List<PjAuditPaths>> pathNameList(PjAuditPaths auditPaths) {
 		LambdaQueryWrapper<PjAuditPaths> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditPaths.getBusinessType()),PjAuditPaths::getBusinessType,auditPaths.getBusinessType())
+		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditPaths.getBusinessType()), PjAuditPaths::getBusinessType, auditPaths.getBusinessType())
 			.eq(PjAuditPaths::getTenantId, AuthUtil.getTenantId());
 		//根据类型获得所有数据
 		List<PjAuditPaths> list = auditPathsService.list(lambdaQueryWrapper);
 		//根据审批名称去重
 		List<PjAuditPaths> pathsList = new ArrayList<>();
 		//根据类型去重
-		if (ObjectUtil.isNotEmpty(list)){
+		if (ObjectUtil.isNotEmpty(list)) {
 			pathsList = list.stream().collect(Collectors.collectingAndThen(
 				Collectors.toCollection(() -> new TreeSet<>(
 					Comparator.comparing(PjAuditPaths::getPathName))), ArrayList::new));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditPathsLevelsController.java

@@ -70,9 +70,7 @@ public class AuditPathsLevelsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入auditPathsLevels")
 	public R<IPage<PjAuditPathsLevels>> list(PjAuditPathsLevels auditPathsLevels, Query query) {
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			auditPathsLevels.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		}
+		auditPathsLevels.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		IPage<PjAuditPathsLevels> pages = auditPathsLevelsService.page(Condition.getPage(query), Condition.getQueryWrapper(auditPathsLevels));
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditProecessController.java

@@ -93,14 +93,12 @@ public class AuditProecessController extends BladeController {
 		lambdaQueryWrapper.gt(auditProecess.getApplybegintime() != null, PjAuditProecess::getSendTime, auditProecess.getApplybegintime());//请核时间
 		lambdaQueryWrapper.le(auditProecess.getApplyendtime() != null, PjAuditProecess::getSendTime, auditProecess.getApplyendtime());
 		lambdaQueryWrapper.orderByDesc(PjAuditProecess::getSendTime);
-		if (ObjectUtils.isNotNull(auditProecess.getBillTimeList())){
-			lambdaQueryWrapper.gt( PjAuditProecess::getBillTime, auditProecess.getBillTimeList().get(0));
-			lambdaQueryWrapper.lt( PjAuditProecess::getBillTime, auditProecess.getBillTimeList().get(1));
+		if (ObjectUtils.isNotNull(auditProecess.getBillTimeList())) {
+			lambdaQueryWrapper.gt(PjAuditProecess::getBillTime, auditProecess.getBillTimeList().get(0));
+			lambdaQueryWrapper.lt(PjAuditProecess::getBillTime, auditProecess.getBillTimeList().get(1));
 		}
 		lambdaQueryWrapper.ne(StringUtils.isBlank(auditProecess.getAuditStatus()), PjAuditProecess::getAuditStatus, "N");
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			lambdaQueryWrapper.eq(PjAuditProecess::getSalesCompanyId, AuthUtil.getDeptId());//公司
-		}
+		lambdaQueryWrapper.eq(PjAuditProecess::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		IPage pages = auditProecessService.page(Condition.getPage(query), lambdaQueryWrapper);
 		List<PjAuditProecess> auditProecessList = pages.getRecords();
 		if (CollectionUtils.isNotEmpty(auditProecessList)) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsTypeController.java

@@ -34,9 +34,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.salesPart.corps.service.ICorpsTypeService;
-import org.springblade.salesPart.entity.PjAccountManagement;
 import org.springblade.salesPart.entity.PjCorpsType;
-import org.springblade.salesPart.entity.PjStorageDesc;
 import org.springblade.salesPart.vo.CorpsTypeVO;
 import org.springframework.web.bind.annotation.*;
 
@@ -75,9 +73,7 @@ public class CorpsTypeController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入corpsType")
 	public R<IPage<PjCorpsType>> list(PjCorpsType corpsType, Query query) {
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			corpsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		}
+		corpsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		IPage<PjCorpsType> pages = corpsTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(corpsType));
 		return R.data(pages);
 	}
@@ -91,9 +87,7 @@ public class CorpsTypeController extends BladeController {
 	public R<IPage<CorpsTypeVO>> page(CorpsTypeVO corpsType, Query query) {
 		corpsType.setIsDeleted(0);
 		corpsType.setTenantId(SecureUtil.getTenantId());
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			corpsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		}
 		IPage<CorpsTypeVO> pages = corpsTypeService.selectCorpsTypePage(Condition.getPage(query), corpsType);
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsTypeMapper.java

@@ -54,7 +54,7 @@ public interface CorpsTypeMapper extends BaseMapper<PjCorpsType> {
 	 * @param parentId
 	 * @return
 	 */
-	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType,String cname);
+	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType,String cname,String dept);
 
 	/**
 	 * 获取客户类别的名称

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsTypeMapper.xml

@@ -170,6 +170,9 @@
         <if test="param4!=null and param4!=''">
             and dept.cname = #{param4}
         </if>
+        <if test="param5!=null and param5!=''">
+            and dept.sales_company_id = #{param5}
+        </if>
         ORDER BY dept.sort
     </select>
     <select id="selectCorpsTypeCname" resultMap="corpsTypeResultMap">

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -156,8 +156,8 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 			if (AuthUtil.getUserRole().contains("业务员")) {
 				corpsDesc.setSalesmanId(AuthUtil.getUserId());
 			}
-			corpsDesc.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
+		corpsDesc.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		IPage<CorpsDescVO> page1 = page.setRecords(baseMapper.selectCorpsDescPage(page, corpsDesc));
 		return page1;
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsTypeServiceImpl.java

@@ -121,11 +121,8 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, PjCorpsTy
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			return ForestNodeMerger.merge(baseMapper.tree(tenantId, corpType,Long.parseLong(AuthUtil.getDeptId())));
-		}else{
-			return ForestNodeMerger.merge(baseMapper.tree(tenantId, corpType,null));
-		}
+
 	}
 
 	@Override
@@ -143,7 +140,7 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, PjCorpsTy
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		return baseMapper.lazyTree(tenantId, parentId, corpType,cname);
+		return baseMapper.lazyTree(tenantId, parentId, corpType,cname,AuthUtil.getDeptId());
 	}
 
 	@Override

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsTypeController.java

@@ -26,7 +26,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.salesPart.entity.PjGoodsDesc;
 import org.springblade.client.goods.enums.GoodsTypeEnum;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.exception.ServiceException;
@@ -36,6 +35,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.salesPart.entity.PjGoodsDesc;
 import org.springblade.salesPart.entity.PjGoodsType;
 import org.springblade.salesPart.goods.service.IGoodsDescService;
 import org.springblade.salesPart.goods.service.IGoodsTypeService;
@@ -83,9 +83,7 @@ public class GoodsTypeController extends BladeController {
 	public R<IPage<PjGoodsType>> list(PjGoodsType goodsType, Query query) {
 		goodsType.setTenantId(AuthUtil.getTenantId());
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		}
+		goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		IPage<PjGoodsType> pages = goodsTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsType));
 		return R.data(pages);
 	}
@@ -99,15 +97,13 @@ public class GoodsTypeController extends BladeController {
 	public R<IPage<GoodsTypeVO>> page(GoodsTypeVO goodsType, Query query) {
 		goodsType.setTenantId(AuthUtil.getTenantId());
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		}
+		goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		IPage<GoodsTypeVO> pages = goodsTypeService.selectGoodsTypePage(Condition.getPage(query), goodsType);
 		return R.data(pages);
 	}
 
 	/**
-	 *商品类别表
+	 * 商品类别表
 	 */
 	@GetMapping("/listAll")
 	@ApiOperationSupport(order = 3)
@@ -116,9 +112,7 @@ public class GoodsTypeController extends BladeController {
 		goodsType.setTenantId(AuthUtil.getTenantId());
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
 		goodsType.setIsDeleted(0);
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		}
+		goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		List<PjGoodsType> list = goodsTypeService.list(Condition.getQueryWrapper(goodsType));
 		return R.data(list);
 	}
@@ -149,12 +143,11 @@ public class GoodsTypeController extends BladeController {
 		if (count != null && count > 0) {
 			return R.fail(500, "存在下级类别不能删除");
 		}
-		LambdaQueryWrapper<PjGoodsDesc> lambdaQueryWrapper=new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.apply("find_in_set('"+goodsType.getId()+"',goods_type_id)")
-		    .eq(PjGoodsDesc::getTenantId,AuthUtil.getTenantId())
-			.eq(PjGoodsDesc::getIsDeleted,0);
-		if(goodsDescService.count(lambdaQueryWrapper)>0)
-		{
+		LambdaQueryWrapper<PjGoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.apply("find_in_set('" + goodsType.getId() + "',goods_type_id)")
+			.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
+			.eq(PjGoodsDesc::getIsDeleted, 0);
+		if (goodsDescService.count(lambdaQueryWrapper) > 0) {
 			return R.fail(500, "存在绑定商品无法删除");
 		}
 		goodsType.setIsDeleted(1);
@@ -216,7 +209,7 @@ public class GoodsTypeController extends BladeController {
 	}
 
 	/**
-	 *商品类别表(app配件-一级)
+	 * 商品类别表(app配件-一级)
 	 */
 	@GetMapping("/firstGoodsType")
 	@ApiOperationSupport(order = 3)
@@ -228,33 +221,29 @@ public class GoodsTypeController extends BladeController {
 		goodsType.setParentId(0l);
 		goodsType.setIsDeleted(0);
 		goodsType.setStatus(0);
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		}
 		List<PjGoodsType> list = goodsTypeService.list(Condition.getQueryWrapper(goodsType));
 		return R.data(list);
 	}
 
 	/**
-	 *商品类别表(app配件-二级)
+	 * 商品类别表(app配件-二级)
 	 */
 	@GetMapping("/secondGoodsType")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "商品类别表", notes = "")
 	public R<List<PjGoodsType>> secondGoodsType(@RequestParam("id") Long id) {
 		LambdaQueryWrapper<PjGoodsType> goodsTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getTenantId,AuthUtil.getTenantId());
-		goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getIsDeleted,0);
-		goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getType,GoodsTypeEnum.GOODS.getType());
-		goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getStatus,0);
-		if (ObjectUtils.isNotNull(id)){
-			goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getParentId,id);
-		}else{
-			goodsTypeLambdaQueryWrapper.gt(PjGoodsType::getParentId,0);
-		}
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getSalesCompanyId,Long.parseLong(AuthUtil.getDeptId()));
+		goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getTenantId, AuthUtil.getTenantId());
+		goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getIsDeleted, 0);
+		goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getType, GoodsTypeEnum.GOODS.getType());
+		goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getStatus, 0);
+		if (ObjectUtils.isNotNull(id)) {
+			goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getParentId, id);
+		} else {
+			goodsTypeLambdaQueryWrapper.gt(PjGoodsType::getParentId, 0);
 		}
+			goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getSalesCompanyId, Long.parseLong(AuthUtil.getDeptId()));
 		List<PjGoodsType> list = goodsTypeService.list(goodsTypeLambdaQueryWrapper);
 		return R.data(list);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/mapper/GoodsTypeMapper.java

@@ -60,7 +60,7 @@ public interface GoodsTypeMapper extends BaseMapper<PjGoodsType> {
 	 * @param type
 	 * @return
 	 */
-	List<GoodsTypeVO> lazyTree(@Param("tenantId") String tenantId, @Param("parentId") Long parentId, @Param("type") Long type);
+	List<GoodsTypeVO> lazyTree(@Param("tenantId") String tenantId, @Param("parentId") Long parentId, @Param("type") Long type,@Param("dept") String dept);
 
 	/**
 	 * 获取商品类别名称

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/mapper/GoodsTypeMapper.xml

@@ -157,6 +157,9 @@ WHERE
         <if test="param1!=null and param1!=''">
             and dept.tenant_id = #{param1}
         </if>
+        <if test="dept!=null and dept!=''">
+            and dept.sales_company_id = #{dept}
+        </if>
         AND type = #{type}
         ORDER BY dept.sort
     </select>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsTypeServiceImpl.java

@@ -87,11 +87,8 @@ public class GoodsTypeServiceImpl extends ServiceImpl<GoodsTypeMapper, PjGoodsTy
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			return ForestNodeMerger.merge(baseMapper.tree(tenantId, type,Long.parseLong(AuthUtil.getDeptId())));
-		}else{
-			return ForestNodeMerger.merge(baseMapper.tree(tenantId, type,null));
-		}
+
 	}
 
 	@Override
@@ -138,7 +135,7 @@ public class GoodsTypeServiceImpl extends ServiceImpl<GoodsTypeMapper, PjGoodsTy
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		return baseMapper.lazyTree(tenantId, parentId, type);
+		return baseMapper.lazyTree(tenantId, parentId, type,AuthUtil.getDeptId());
 	}
 
 	/**

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/controller/SettlementController.java

@@ -32,12 +32,10 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.salesPart.entity.PjAccountManagement;
 import org.springblade.salesPart.entity.PjSettlement;
 import org.springblade.salesPart.entity.PjSettlementItems;
 import org.springblade.salesPart.entity.PjpfFiles;
 import org.springblade.salesPart.excel.PjSettlementExcel;
-import org.springblade.salesPart.files.mapper.PjpfFilesMapper;
 import org.springblade.salesPart.files.service.PjpfFilesService;
 import org.springblade.salesPart.settlement.service.ISettlementItemsService;
 import org.springblade.salesPart.settlement.service.ISettlementService;
@@ -102,11 +100,7 @@ public class SettlementController extends BladeController {
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getAccountId()), PjSettlement::getAccountId, settlement.getAccountId());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getFinanceStatus()), PjSettlement::getFinanceStatus, settlement.getFinanceStatus());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getSettlementDate()), PjSettlement::getSettlementDate, settlement.getSettlementDate());
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			lambdaQueryWrapper.eq(PjSettlement::getSalesCompanyId, AuthUtil.getDeptId());//公司
-		}else{
-			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getSalesCompanyId()), PjSettlement::getSalesCompanyId, settlement.getSalesCompanyId());
-		}
+		lambdaQueryWrapper.eq(PjSettlement::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getDc()), PjSettlement::getDc, settlement.getDc());
 		if (ObjectUtils.isNotNull(settlement.getSettlementDateList()) && settlement.getSettlementDateList().size() > 0) {
 			lambdaQueryWrapper.ge(PjSettlement::getSettlementDate, settlement.getSettlementDateList().get(0));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -68,6 +68,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		BigDecimal cost = new BigDecimal("0.00");
 		List<PjOrder> pjOrderListD = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
@@ -90,6 +91,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		}
 		List<PjOrder> pjOrderListM = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
@@ -129,6 +131,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		List<StayDoOrder> stayDoOrderList = new ArrayList<>();
 		List<PjOrder> pjOrderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.apply("find_in_set(status,'录入,待确认')")
@@ -157,6 +160,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		}
 		List<PjShip> pjShipListRW = shipService.list(new LambdaQueryWrapper<PjShip>()
 			.eq(PjShip::getTenantId, AuthUtil.getTenantId())
+			.eq(PjShip::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjShip::getIsDeleted, 0)
 			.eq(PjShip::getBizTypeName, "FHRW")
 			.eq(PjShip::getStatusName, "待处理")
@@ -164,6 +168,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.le(quer.getDateList().size() > 0, PjShip::getBusinesDate, quer.getDateList().get(1)));
 		List<PjShip> pjShipListGD = shipService.list(new LambdaQueryWrapper<PjShip>()
 			.eq(PjShip::getTenantId, AuthUtil.getTenantId())
+			.eq(PjShip::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjShip::getIsDeleted, 0)
 			.eq(PjShip::getBizTypeName, "FHGD")
 			.eq(PjShip::getStatusName, "待出库")
@@ -186,6 +191,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		if (ids.size() > 0) {
 			orderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
 				.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+				.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 				.eq(PjOrder::getIsDeleted, 0)
 				.in(PjOrder::getId, ids));
 		}
@@ -263,6 +269,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 	public R dayNumber() {
 		List<PjOrder> pjOrderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
@@ -291,6 +298,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 	public R brandSalesVolume(String statusDate, String endDate) {
 		List<PjOrder> pjOrderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.gt(PjOrder::getBusinesDate, statusDate)
@@ -331,6 +339,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 	public R corpsSalesVolume(String statusDate, String endDate) {
 		List<PjOrder> pjOrderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.gt(PjOrder::getBusinesDate, statusDate)
@@ -371,6 +380,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 	public R sizeSalesVolumeProportion(String statusDate, String endDate) {
 		List<PjOrder> pjOrderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.gt(PjOrder::getBusinesDate, statusDate)
@@ -418,6 +428,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		Map<String, Object> map = new HashMap<>();
 		List<PjOrder> pjOrderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.gt(PjOrder::getBusinesDate, statusDate)

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/storage/controller/StorageDescController.java

@@ -91,14 +91,7 @@ public class StorageDescController extends BladeController {
 			.like(ObjectUtils.isNotEmpty(storageDesc.getStorageCapacity()), PjStorageDesc::getStorageCapacity, storageDesc.getStorageCapacity())//库容
 			.eq(ObjectUtils.isNotEmpty(storageDesc.getSalesCompanyId()), PjStorageDesc::getSalesCompanyId, storageDesc.getSalesCompanyId())//所属公司
 			.in(ObjectUtils.isNotEmpty(storageDesc.getSharedCompany()), PjStorageDesc::getSharedCompany, storageDesc.getSharedCompany());//共享公司
-
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			lambdaQueryWrapper.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
-		}
-		/*String role = AuthUtil.getUserRole();
-		if (!role.contains("admin")){
-			lambdaQueryWrapper.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
-		}*/
+		lambdaQueryWrapper.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		IPage<PjStorageDesc> pages = storageDescService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -176,7 +176,7 @@ public class UserController {
 			.eq(User::getIsDeleted, 0);
 
 		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			if ("1504336886057963521".equals(userVO.getDeptPid())) {
+			if ("1504336886057963521".equals(userVO.getDeptPid()) || "1567796746975727617".equals(userVO.getDeptPid())) {
 				userVO.setRoleAlias("分管调度");
 			} else {
 				userVO.setRoleAlias("大件调度");

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -102,7 +102,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		if (Func.isNotEmpty(user.getPassword())) {
 			user.setPassword(DigestUtil.encrypt(user.getPassword()));
 		}
-		Integer userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
+		Integer userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId)
+			.eq(User::getAccount, user.getAccount())
+			.eq(User::getAppletsId, user.getAppletsId())
+		);
 		if (userCount > 0 && Func.isEmpty(user.getId())) {
 			throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
 		}