[CODE]: 财务从表主键、小程序叫车进场变更主表状态

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -310,7 +310,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 客户
         tWhgenleg.setfCorpid(warehouseBills.getfCorpid());
         // 提单号
-        if ("HQZY".equals(warehouseBills.getfBilltype()) || "CKDB".equals(warehouseBills.getfBilltype())) {
+        if ("HQZY".equals(warehouseBills.getfBilltype()) || "CKDB".equals(warehouseBills.getfBilltype()) || "HWTG".equals(warehouseBills.getfBilltype())  ) {
             tWhgenleg.setfMblno(warehousebillsitems.getfMblno());
         } else {
             tWhgenleg.setfMblno(warehouseBills.getfMblno());
@@ -880,7 +880,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         tWarehousebillsitems.setfSerialNumber(tWarehousebillsitems1.getfSerialNumber());
         int  num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(tWarehousebillsitems);
-        if (num <= 0) {
+        // 主表变更状态
+        TWarehouseBills tWarehousebills = new TWarehouseBills();
+        tWarehousebills.setfId(tWarehousebillsitems1.getfPid());
+        tWarehousebills.setfItemsStatus(3L);
+        int  num1 = tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
+        if (num <= 0  && num1 <= 0 ) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新库存明细失败");
         }else{

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeDoMapper.xml

@@ -59,7 +59,6 @@
     <insert id="insertTFeeDo" parameterType="TFeeDo" useGeneratedKeys="true" keyProperty="fId">
         insert into t_fee_do
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fId != null">f_id,</if>
             <if test="fPid != null">f_pid,</if>
             <if test="fActId != null">f_act_id,</if>
             <if test="fLineno != null">f_lineno,</if>
@@ -81,7 +80,6 @@
             <if test="fRemarks != null">f_remarks,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fId != null">#{fId},</if>
             <if test="fPid != null">#{fPid},</if>
             <if test="fActId != null">#{fActId},</if>
             <if test="fLineno != null">#{fLineno},</if>