2023年10月19日17:46:39

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Containers.java

@@ -106,7 +106,7 @@ public class Containers implements Serializable {
 	 * 行号
 	 */
 	@ApiModelProperty(value = "行号")
-	private Integer lineNo;
+	private Long lineNo;
 	/**
 	 * 单据编号
 	 */

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/ContainersCommodity.java

@@ -108,7 +108,7 @@ public class ContainersCommodity implements Serializable {
 	 * 行号
 	 */
 	@ApiModelProperty(value = "行号")
-	private Integer lineNo;
+	private Long lineNo;
 	/**
 	 * 商品 HS-CODE
 	 */

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FeeCenter.java

@@ -109,7 +109,7 @@ public class FeeCenter implements Serializable {
 	 * 行号 基于pid 1...
 	 */
 	@ApiModelProperty(value = "行号 基于pid 1...")
-	private Integer lineNo;
+	private Long lineNo;
 	/**
 	 * 单据编号
 	 */

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.xml

@@ -137,10 +137,10 @@
             AND bd.sales_company = #{salesCompany}
         </if>
         <if test="businessDate != null and businessDate == 0">
-            AND TO_DAYS(bd.business_date) = TO_DAYS(NOW())
+            and DATE_FORMAT(bd.busines_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
         </if>
         <if test="businessDate != null and businessDate == 1">
-            AND MONTH(bd.business_date) = MONTH(NOW())
+            and DATE_FORMAT(bd.busines_date,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
         </if>
     </select>
     <update id="submitPay" parameterType="long">

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/ContainersBillsMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.business.sea.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.los.business.sea.entity.ContainersBills;
 import org.springblade.los.business.sea.vo.ContainersBillsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,5 +40,5 @@ public interface ContainersBillsMapper extends BaseMapper<ContainersBills> {
 	 */
 	List<ContainersBillsVO> selectContainersBillsPage(IPage page, ContainersBillsVO containersBills);
 
-	void removeByPid(Long pid);
+	void removeByPid(@Param("pid") Long pid);
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/ContainersBillsMapper.xml

@@ -51,7 +51,7 @@
         <result column="remarks" property="remarks"/>
     </resultMap>
     <update id="removeByPid">
-        update los_sea_containers set is_deleted = '1' where pp_id = #{pid}
+        update los_sea_containers_bills set is_deleted = '1' where pp_id = #{pid}
     </update>
 
 

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -129,7 +129,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				bills.setCreateDeptName(deptName);
 			}
 		} else {
-			if (billNo > 0) {
+			if (billNo > 1) {
 				throw new RuntimeException("单据编号不允许重复");
 			}
 			bills.setUpdateUser(AuthUtil.getUserId());

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/PreContainersServiceImpl.java

@@ -139,7 +139,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 			containers.setIsSoc(preContainers.getIsSoc());
 			containers.setIsOneway(preContainers.getIsOneway());
 			containers.setCntrTypeCode(preContainers.getCntrTypeCode());
-			containers.setLineNo(Integer.parseInt(preContainers.getId() + ""));
+			containers.setLineNo(preContainers.getId());
 			containersList.add(containers);
 		}
 		containersService.saveOrUpdateBatch(containersList);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.xml

@@ -247,6 +247,7 @@ WHERE
         LEFT JOIN ( SELECT pid, IFNULL( SUM( order_quantity ), 0 ) AS quantity FROM business_order_items WHERE is_deleted = 0 AND good_type = 0 GROUP BY pid ) bt ON bt.pid = bo.id
         WHERE bo.is_deleted = 0
 	        AND bo.`status` = 3
+            and DATE_FORMAT(bo.busines_date,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
             <if test="tenantId!=null and tenantId != ''">
             AND bo.tenant_id = #{tenantId}
             </if>
@@ -269,7 +270,7 @@ WHERE
         AND bt.is_deleted = 0
         AND bo.`status` = 3
         AND bt.good_type = 0
-        AND MONTH(bo.busines_date) = MONTH(NOW())
+        AND DATE_FORMAT(bo.busines_date,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
         <if test="tenantId!=null and tenantId != ''">
             AND bo.tenant_id = #{tenantId}
         </if>

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -631,7 +631,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			}
 			if (items.getThisAmount().compareTo(new BigDecimal("0.00")) == 0) {
 				acc.setSettlementAmount(acc.getSettlementAmount().subtract(items.getMemberBalance()));
-			}else{
+			} else {
 				acc.setSettlementAmount(acc.getSettlementAmount().subtract(items.getThisAmount()));
 			}
 			//判断是否退款,已收金额为负数
@@ -1117,12 +1117,18 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			TradingBoxFees tradingBoxFees = new TradingBoxFees();
 			if ("对账".equals(settlementDTO.getBillType())) {
 				acc.setCheckAmount(acc.getCheckAmount() != null ? acc.getCheckAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
+				if (acc.getCheckAmount().compareTo(acc.getAmount()) > 0) {
+					throw new RuntimeException("箱号：" + acc.getSrcSysno() + "对账金额已超出账单金额，操作失败");
+				}
 				tradingBoxFeesR.getData().setReconciliationAmount(tradingBoxFeesR.getData().getReconciliationAmount() != null ? tradingBoxFeesR.getData().getReconciliationAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				accMapper.updateById(acc);
 				BeanUtils.copyProperties(tradingBoxFeesR.getData(), tradingBoxFees);
 				tradingBoxFees.setReconciliationDate(settlementDTO.getSettlementDate());
 			} else {
 				acc.setSettlementAmount(acc.getSettlementAmount() != null ? acc.getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
+				if (acc.getSettlementAmount().compareTo(acc.getAmount()) > 0) {
+					throw new RuntimeException("箱号：" + acc.getSrcSysno() + "结算金额已超出账单金额，操作失败");
+				}
 				tradingBoxFeesR.getData().setSettlementAmount(tradingBoxFeesR.getData().getSettlementAmount() != null ? tradingBoxFeesR.getData().getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				accMapper.updateById(acc);
 				BeanUtils.copyProperties(tradingBoxFeesR.getData(), tradingBoxFees);
@@ -1141,11 +1147,17 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			}
 			if ("对账".equals(settlementDTO.getBillType())) {
 				acc.setCheckAmount(acc.getCheckAmount() != null ? acc.getCheckAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
+				if (acc.getCheckAmount().compareTo(acc.getAmount()) > 0) {
+					throw new RuntimeException("箱号：" + acc.getSrcSysno() + "对账金额已超出账单金额，操作失败");
+				}
 				transportItemFeesR.getData().setReconciliationAmount(transportItemFeesR.getData().getReconciliationAmount() != null ? transportItemFeesR.getData().getReconciliationAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				accMapper.updateById(acc);
 				transportItemFeesR.getData().setReconciliationDate(settlementDTO.getSettlementDate());
 			} else {
 				acc.setSettlementAmount(acc.getSettlementAmount() != null ? acc.getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
+				if (acc.getSettlementAmount().compareTo(acc.getAmount()) > 0) {
+					throw new RuntimeException("箱号：" + acc.getSrcSysno() + "结算金额已超出账单金额，操作失败");
+				}
 				transportItemFeesR.getData().setSettlementAmount(transportItemFeesR.getData().getSettlementAmount() != null ? transportItemFeesR.getData().getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				accMapper.updateById(acc);
 				transportItemFeesR.getData().setSettlementDate(settlementDTO.getSettlementDate());