售后收货单调式

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue

@@ -308,7 +308,7 @@ export default {
         procInsId: row.procInstId,
         token: getStorage()
       }
-      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+      this.url = 'http://localhost:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
     // 搜索条件效果
     clicksearchShow() {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillDto2.java

@@ -43,6 +43,7 @@ public class WmsReceiptBillDto2 {
     //单据状态：新建/已完成
     @ApiModelProperty("单据状态：待收货/部分收货/已收货(默认)")
     private String billState;
+    private String billStateKey;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("使用组织sid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@@ -120,6 +120,11 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
             if (!list.isEmpty()) {
                 wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
             }
+            if("0".equals(dto.getBillStateKey())){
+                wmsReceiptBill.setBillState("0");
+            }else{
+                wmsReceiptBill.setBillState("1");
+            }
             baseMapper.insert(wmsReceiptBill);
 
         } else {
@@ -135,6 +140,11 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
             if (!list.isEmpty()) {
                 wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
             }
+            if("0".equals(dto.getBillStateKey())){
+                wmsReceiptBill.setBillState("0");
+            }else{
+                wmsReceiptBill.setBillState("1");
+            }
             baseMapper.updateById(wmsReceiptBill);
         }
         return rb.success().setData(sid);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java

@@ -19,7 +19,8 @@ public class WmsReceiptBillDetailVo {
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
     @ApiModelProperty("商品Sku名称")
-    private String goodsSkuTitle;
+//    private String goodsSkuTitle;
+    private String goodsSpuName;
     @ApiModelProperty("商品sku编码")
     private String goodsSkuCode;
     @ApiModelProperty("规格型号")