Merge remote-tracking branch 'origin/dev' into dev

topsun-xt/src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleDetail.js

@@ -13,6 +13,7 @@ function initialize(){
         UICtrl.setElHideOrShow("#budat",true)
         UICtrl.setElHideOrShow("#paymentMethod",true)
         UICtrl.setElHideOrShow("#totalMoney",true)
+        UICtrl.setElHideOrShow("#carNo",true)
     }
 }
 
@@ -75,6 +76,12 @@ function getGridColumns(){
             }
         },
     },)
+    columns.push({
+        display: "出售物品", name: "saleGoods", width: 300, minWidth: 60, type: "string", align: "left",
+        editor: {
+            required: true, type: "text",
+        }
+    },)
     columns.push({
         display: "数量", name: "quantity", width: 200, minWidth: 60, type: "string", align: "left",
         editor: {
@@ -118,6 +125,36 @@ function getGridColumns(){
                 }
             }
         },)
+        columns.push({
+            display: "车辆皮重", name: "carWeight", width: 150, minWidth: 60, type: "string", align: "left",
+            editor: {
+                required: false, type: "text",mask: '9999999.99'
+            }
+        },)
+        columns.push({
+            display: "毛重", name: "grossWeight", width: 150, minWidth: 60, type: "string", align: "left",
+            editor: {
+                required: false, type: "text",mask: '9999999.99'
+            }
+        },)
+        columns.push({
+            display: "扣减重量", name: "deductWeight", width: 150, minWidth: 60, type: "string", align: "left",
+            editor: {
+                required: false, type: "text",mask: '9999999.99'
+            }
+        },)
+        columns.push({
+            display: "净重", name: "netWeight", width: 150, minWidth: 60, type: "string", align: "left",
+            editor: {
+                required: false, type: "text",mask: '9999999.99'
+            }
+        },)
+        columns.push({
+            display: "备注", name: "remark", width: 200, minWidth: 60, type: "string", align: "left",
+            editor: {
+                required: false, type: "text"
+            }
+        },)
     }
     return columns;
 }
@@ -184,6 +221,7 @@ function businessJudgmentUnit() {
             UICtrl.setElRequiredFlag('#bktxt', true);
             UICtrl.setElRequiredFlag('#budat', true);
             UICtrl.setElRequiredFlag('#paymentMethod', true);
+            UICtrl.setElRequiredFlag('#carNo', true);
             UICtrl.disable($("#totalMoney"))
             return true
         }

topsun-xt/src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleDetail.jsp

@@ -27,6 +27,10 @@
             <x:hidden name="burks"/>
             <x:inputC name="bktxt" required="false" label="回收商" labelCol="2" fieldCol="2" />
             <x:inputC name="budat" required="false" label="回收日期" labelCol="2" fieldCol="2" wrapper="date"/>
+            <x:inputC name="carNo" required="false" label="车牌号" labelCol="2" fieldCol="2" />
+        </div>
+        <div class="hg-form-row">
+            <x:textareaC name="remark" required="false" label="备注" labelCol="2" fieldCol="10" rows="2"/>
         </div>
     </div>
     <div class="blank_div clearfix"></div>

topsun-xt/src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleList.js

@@ -23,6 +23,8 @@ function loadGrid() {
             {display: "回收日期", name: "budat", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "收款方式", name: "paymentMethodTextView", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "合计", name: "totalMoney", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "车牌号", name: "carNo", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "备注", name: "remark", width: 300, minWidth: 60, type: "string", align: "left"},
             {display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "会计凭证编号", name: "messageV1", width: 200, minWidth: 60, type: "string", align: "left"},
         ],

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/SapPurchaseApprovalItemApplication.java

@@ -19,4 +19,6 @@ public interface SapPurchaseApprovalItemApplication {
     void deleteByIds(List<String> ids);
 
     Map<String, Object> querySapPurchaseApprovalItems(SapPurchaseApprovalItemQueryRequest queryRequest);
+
+    List<SapPurchaseApprovalItem> querySapPurchaseApprovalItems(String sapPurchaseApprovalId);
 }

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -275,14 +275,18 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
      * 远程调用sap接口，传递数据
      */
     public void sendSapDate(SapPurchaseApproval sapPurchaseApproval, String flag) {
+        List<SapPurchaseApprovalItem> approvalItemList = sapPurchaseApprovalItemApplication.querySapPurchaseApprovalItems(sapPurchaseApproval.getId());
+        List<Map<String,Object>> paramList= new ArrayList<>();
+        for (SapPurchaseApprovalItem sapPurchaseApprovalItem : approvalItemList) {
             Map<String,Object> paramItem = new HashMap<>();
             paramItem.put("banfn",sapPurchaseApproval.getBanfn());
             paramItem.put("BEDNR",sapPurchaseApproval.getBillCode());
             paramItem.put("frgkz","10");
-        paramItem.put("bnfpo","10");
+            paramItem.put("bnfpo",sapPurchaseApprovalItem.getBnfpo());
             paramItem.put("flag",flag);
-        List<Map<String,Object>> paramList= new ArrayList<>();
             paramList.add(paramItem);
+
+        }
         Map<String,Object> param = new HashMap<>();
         param.put("MODE","PR");
         param.put("DATA",paramList);

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalItemApplicationImpl.java

@@ -49,4 +49,9 @@ public class SapPurchaseApprovalItemApplicationImpl extends BaseApplication impl
         }
         return map;
     }
+
+    @Override
+    public List<SapPurchaseApprovalItem> querySapPurchaseApprovalItems(String sapPurchaseApprovalId) {
+        return sapPurchaseApprovalItemRepository.findBySapPurchaseApprovalId(sapPurchaseApprovalId);
+    }
 }

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/repository/SapPurchaseApprovalItemRepository.java

@@ -3,10 +3,13 @@ package com.huigou.topsun.sap.purchaseApproval.repository;
 import com.huigou.topsun.sap.purchaseApproval.domain.SapPurchaseApprovalItem;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 /**
  * @Auther: xin.lu
  * @Date: 2024/01/09/19:01
  * @Description:
  */
 public interface SapPurchaseApprovalItemRepository extends JpaRepository<SapPurchaseApprovalItem,String> {
+    List<SapPurchaseApprovalItem> findBySapPurchaseApprovalId(String sapPurchaseApprovalId);
 }

topsun/src/main/java/com/huigou/topsun/sap/wasteSale/domain/WasteSale.java

@@ -60,6 +60,18 @@ public class WasteSale extends FlowBillAbstractEntity {
     @Column(name = "message_v1")
     private String messageV1;
 
+    /**
+     * 车牌号
+     */
+    @Column(name = "car_no")
+    private String carNo;
+
+    /**
+     * 备注
+     */
+    @Column(name = "remark")
+    private String remark;
+
 
     @Override
     protected String getCodeRuleId() {

topsun/src/main/java/com/huigou/topsun/sap/wasteSale/domain/WasteSaleItem.java

@@ -60,4 +60,39 @@ public class WasteSaleItem extends AbstractEntity {
     @Column(name = "amount")
     private BigDecimal amount;
 
+    /**
+     * 车辆皮重
+     */
+    @Column(name = "car_weight")
+    private BigDecimal carWeight;
+
+    /**
+     * 毛重
+     */
+    @Column(name = "gross_weight")
+    private BigDecimal grossWeight;
+
+    /**
+     * 扣减重量
+     */
+    @Column(name = "deduct_weight")
+    private BigDecimal deductWeight;
+
+    /**
+     * 净重
+     */
+    @Column(name = "net_weight")
+    private BigDecimal netWeight;
+
+    /**
+     * 备注
+     */
+    @Column(name = "remark")
+    private String remark;
+
+    /**
+     * 出售物品
+     */
+    @Column(name = "sale_goods")
+    private String saleGoods;
 }