Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue

@@ -225,7 +225,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button type="primary" size="small" @click="ReportConfirm">确定</el-button>
-        <el-button size="small" @click="ReportClose">取消</el-button>
+        <el-button size="small" @click="ReportColse">取消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -463,7 +463,7 @@ export default {
     },
     toReport() {
       if (this.sids.length === 1) {
-        if (this.multipleSelection[0].reportFirstDate === '') {
+        if (this.multipleSelection[0].reportFirstDate !== '' && this.multipleSelection[0].reportFirstDate !== null) {
           this.$message({ showClose: true, type: 'error', message: '报告首次提报时间已存在，无法修改' })
           return
         }
@@ -559,9 +559,9 @@ export default {
 </script>
 <style scoped>
 .span-sty {
-  width: 100px !important;
+  width: 120px !important;
 }
 .addinputInfo {
-  margin-left: 90px !important;
+  margin-left: 120px !important;
 }
 </style>

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml

@@ -125,6 +125,7 @@
         FROM
         yxt_wms.wms_inventory as i
         LEFT JOIN yxt_wms.wms_warehouse_area as wa ON wa.warehouseSid = i.warehouseSid
+        LEFT JOIN yxt_wms.wms_warehouse_info as wi ON wi.sid = i.warehouseSid
         LEFT JOIN 	yxt_base.base_goods_sku_extend as e ON e.goodsSkuSid = i.goodsSkuSid
         <where>${ew.sqlSegment}</where>
     </select>

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java

@@ -473,6 +473,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
             qw.eq("i.useOrgSid", query.getUseOrgSid());
         }
+        qw.eq("wi.warehouseTypeValue","配件库");
         qw.apply("i.count > 0");
         IPage<SmsSalesBill> page = PagerUtil.queryToPage(pq);
         IPage<SmsWmsInventorySalesVo> pagging = baseMapper.listPageSalesGoods(page, qw);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml

@@ -45,11 +45,10 @@
         wi.warehouseRackCode,
         wi.count,
         wi.sid inventorySid,
-        g.price,
-        g.supplierName,
+        wi.supplierName,
         wi.cost as money
         from wms_inventory wi
-        LEFT JOIN yxt_sms.sms_goods as g ON wi.goodsID = g.goodsID
+        LEFT JOIN yxt_wms.wms_warehouse_info as wh ON wh.sid = wi.warehouseSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java

@@ -148,6 +148,7 @@ public class WmsOutBillService extends MybatisBaseService<WmsOutBillMapper, WmsO
             qw.eq("wi.useOrgSid", query.getUseOrgSid());
         }
         qw.apply("wi.count > 0");
+        qw.eq("wh.warehouseTypeValue","配件库");
         //ToDo:供应商
        /* if (StringUtils.isNotBlank(query.getSupplierName())) {
             qw.like("supplierName", query.getSupplierName());