优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java

@@ -97,6 +97,5 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
 
     String fetchByVehSid(String vinSid);
 
-    @Select("SELECT count(*) FROM bus_delivered_apply_details bd left join bus_delivered_apply ba on ba.sid = bd.applySid WHERE bd.vinSid = #{vinSid} AND bd.isDelete = 0 and ba.nodeState != '终止'")
     int fetchByIsDeleteVinSid(String vinSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml

@@ -70,10 +70,11 @@
     <select id="selectVinSidByApplySid" resultType="java.lang.String">
         select bv.sid
         from bus_delivered_apply_details bd
-        left join bus_delivered_apply ba on ba.sid = bd.applySid
-        left join bus_sales_order_vehicle bv on bv.linkSid = bd.vinSid
-        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
-        where bd.applySid = #{sid} and bo.contractNo = ba.contractNo
+                     left join bus_delivered_apply ba on ba.sid = bd.applySid
+                     left join bus_sales_order_vehicle bv on bv.linkSid = bd.vinSid
+                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bd.applySid = #{sid}
+          and bo.contractNo = ba.contractNo
     </select>
 
     <select id="fetchByVehSid" resultType="java.lang.String">
@@ -84,4 +85,14 @@
         WHERE bd.vinSid = #{vinSid}
           AND ba.nodeState = '已办结'
     </select>
+
+    <select id="fetchByIsDeleteVinSid" resultType="int">
+        SELECT count(*)
+        FROM bus_delivered_apply_details bd
+                     LEFT JOIN bus_delivered_apply ba on ba.sid = bd.applySid
+        WHERE bd.vinSid = #{vinSid}
+          AND bd.isDelete = 0
+          AND ba.nodeState != '终止'
+          AND ba.nodeState != '发起申请'
+    </select>
 </mapper>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java

@@ -42,6 +42,6 @@ public class OtherReceivable {
         @ApiModelProperty("不含税金额")
         public String exTaxMoney;
         @ApiModelProperty("用途")
-        public String useTo = "YT018";
+        public String useTo;
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java

@@ -99,6 +99,7 @@ public class OtherReceivableBillService extends FinKingDeeService {
             }
             m.put("FCOSTDEPARTMENTID", c.getDearDept());
             m.put("FNOTAXAMOUNTFOR", c.getExTaxMoney());
+            m.put("F_PAEZ_Assistant1",c.getUseTo());
             collectionDetailMap.add(m);
         }
         return rb.success().setData(collectionDetailMap);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json

@@ -11,7 +11,7 @@
   "FTAXAMOUNTFOR": "0",
   "FAMOUNTFOR_D": "0",
   "F_PAEZ_Assistant1": {
-    "FNumber": "TZSQ"
+    "FNumber": "@KD_F_PAEZ_Assistant1"
   },
   "F_PAEZ_Amount": "0",
   "FNOTAXAMOUNT_D": "0",