到账认领

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -95,6 +95,8 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
         //更新流水数据已认领金额
         if(water.getClaimAmount().add(claim.getAmount()).compareTo(water.getAmount())==0){//如果认领金额=流水金额
             water.setIsClaim(1);//已认领状态
+        }else{
+            water.setIsClaim(2);//部分认领
         }
         water.setClaimAmount(water.getClaimAmount().add(claim.getAmount()));
         accountRunningWaterService.updateById(water);

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -22,7 +22,7 @@
         FROM
             (
                 SELECT
-                    IFNULL(t3.`status`,0) AS quanlityStatus,
+                    IFNULL(t3.`status`,0) AS qualityStatus,
                     t1.create_time AS ct,
                     "外销合同" AS orderType,
                     t1.id,
@@ -46,7 +46,7 @@
                     AND t2.`status` < 88 AND t1.expend_quantity > 0
         UNION ALL
                 SELECT
-                    IFNULL(t3.`status`,0) AS quanlityStatus,
+                    IFNULL(t3.`status`,0) AS qualityStatus,
                     t1.create_time AS ct,
                     "样品单" AS orderType,
                     t1.id,