Merge remote-tracking branch 'origin/master'

2 days ago · e260fb1e18
18 changed files with 55 additions and 24 deletions
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue
@ -193,11 +193,11 @@
              </el-col>
            </el-row>
            <el-row>
-              <el-col :span="6">
+              <el-col :span="12">
                <div class="span-sty">政策明细</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
              </el-col>
-              <el-col :span="18">
+              <el-col :span="12">
                <div class="span-sty">备注</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
              </el-col>
@ -941,10 +941,10 @@ export default {
  border-top: 1px solid #E0E3EB;
 }
 .span-sty {
-  width: 140px !important;
+  width: 160px !important;
 }
 .addinputInfo {
-  margin-left: 130px !important;
+  margin-left: 150px !important;
 }
 .jinrong {
  padding: 7px;
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
@ -193,11 +193,11 @@
              </el-col>
            </el-row>
            <el-row>
-              <el-col :span="6">
+              <el-col :span="12">
                <div class="span-sty">政策明细</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
              </el-col>
-              <el-col :span="18">
+              <el-col :span="12">
                <div class="span-sty">备注</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
              </el-col>
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue
@ -193,11 +193,11 @@
              </el-col>
            </el-row>
            <el-row>
-              <el-col :span="6">
+              <el-col :span="12">
                <div class="span-sty">政策明细</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
              </el-col>
-              <el-col :span="18">
+              <el-col :span="12">
                <div class="span-sty">备注</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
              </el-col>
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
@ -193,11 +193,11 @@
              </el-col>
            </el-row>
            <el-row>
-              <el-col :span="6">
+              <el-col :span="12">
                <div class="span-sty">政策明细</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
              </el-col>
-              <el-col :span="18">
+              <el-col :span="12">
                <div class="span-sty">备注</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
              </el-col>
@ -1002,10 +1002,10 @@ export default {
  padding: 30px 0 20px 0;
 }
 .span-sty {
-  width: 140px !important;
+  width: 160px !important;
 }
 .addinputInfo {
-  margin-left: 130px !important;
+  margin-left: 150px !important;
 }
 .jinrong {
  padding: 7px;
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
@ -189,11 +189,11 @@
              </el-col>
            </el-row>
            <el-row>
-              <el-col :span="6">
+              <el-col :span="12">
                <div class="span-sty">政策明细</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
              </el-col>
-              <el-col :span="18">
+              <el-col :span="12">
                <div class="span-sty">备注</div>
                <el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
              </el-col>
@ -675,10 +675,10 @@ export default {
  padding: 30px 0 20px 0;
 }
 .span-sty {
-  width: 140px !important;
+  width: 160px !important;
 }
 .addinputInfo {
-  margin-left: 130px !important;
+  margin-left: 150px !important;
 }
 .jinrong {
  padding: 7px;
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java
@ -20,4 +20,7 @@ public class AppOldPartsGoodsSJDto implements Dto {
    private String houseCode;
    @ApiModelProperty("数量")
    private BigDecimal count;
+
+    @ApiModelProperty("图号")
+    private String goodsCode;
 }
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java
@ -26,4 +26,7 @@ public class AppOldPartsScanVo implements Vo {
    private String houseName;
    @ApiModelProperty("仓库地址")
    private String houseAddress;
+
+    @ApiModelProperty("图号")
+    private String goodsCode;
 }
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java
@ -190,6 +190,7 @@ public class AppOldPartsService {
            wmsBusrepairInventorybillDetailOldApp.setGoodsID(appOldPartsGoodsSJDto.getGoodsID());
            wmsBusrepairInventorybillDetailOldApp.setWarehouseRackCode(appOldPartsGoodsSJDto.getHouseCode());
            wmsBusrepairInventorybillDetailOldApp.setCount(appOldPartsGoodsSJDto.getCount());
+            wmsBusrepairInventorybillDetailOldApp.setGoodsCode(appOldPartsGoodsSJDto.getGoodsCode());
            wmsBusrepairInventorybillDetailOldApps.add(wmsBusrepairInventorybillDetailOldApp);
        }
        wmsOldGroundConfirmApp.setOldList(wmsBusrepairInventorybillDetailOldApps);
@ -222,6 +223,7 @@ public class AppOldPartsService {
            appOldPartsScanVo.setGoodsID(content);
            appOldPartsScanVo.setGoodsName(asBusrepairInventorybillDetail.getGoodsSkuTitle());
            appOldPartsScanVo.setGoodsMax(chae.setScale(0,BigDecimal.ROUND_DOWN).toString());
+            appOldPartsScanVo.setGoodsCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
        } else if ("1".equals(type)) {//库位码
            if (!content.contains("#")) {
                return rb.setMsg("请扫描库位码");
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java
@ -14,4 +14,6 @@ public class WmsBusrepairInventorybillDetailOldApp {
    private String warehouseRackCode;
    @ApiModelProperty("出/退库数量")
    private BigDecimal count;
+
+    private String goodsCode;
 }
--- a/yxt-as-ui/src/api/storage/oldPartsInvertory.js
+++ b/yxt-as-ui/src/api/storage/oldPartsInvertory.js
@ -15,8 +15,9 @@ export default {
  // 获取旧件出入库记录详情
  init: function(data) {
    return request({
-      url: '/wms/apiadmin/WmsOldInventory/getDetailsList?sid=' + data,
-      method: 'get'
+      url: '/wms/apiadmin/WmsOldInventory/getDetailsList',
+      method: 'get',
+      params: data
    })
  },
  deleteBySids: function(data) {
--- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
+++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
@ -284,7 +284,7 @@ export default {
          userSid: ''
        }
      }
-      this.init()
+      this.getList()
    },
    toAdd() {
      this.viewState = 2
--- a/yxt-as-ui/src/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit.vue
@ -263,7 +263,6 @@

      showAdd() {
        this.title = "【新增】"
-        this.init()
        this.$nextTick(() => {
          this.$refs['form_obj'].clearValidate()
        })
--- a/yxt-as-ui/src/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit.vue
@ -296,7 +296,6 @@
      },
      showAdd() {
        this.title = "【新增】"
-        this.init()
        this.$nextTick(() => {
          this.$refs['form_obj'].clearValidate()
        })
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
@ -406,6 +406,9 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                    //减少库存
                    inventory.setCount(inventoryCount.subtract(count));
                }
+                if(StringUtils.isNotBlank(query.getGoodsCode())){
+                    inventory.setGoodsSkuCode(query.getGoodsCode());
+                }
                baseMapper.updateById(inventory);
            }
        }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsUpdateCountQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsUpdateCountQuery.java
@ -14,4 +14,6 @@ public class WmsUpdateCountQuery {
    private String sid;
    private BigDecimal count;
    private Integer addOrReduce; // 0增加 1减少
+
+    private String goodsCode;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java
@ -14,4 +14,6 @@ public class WmsBusrepairInventorybillDetailOldApp {
    private String warehouseRackCode;
    @ApiModelProperty("出/退库数量")
    private BigDecimal count;
+
+    private String goodsCode;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml
@ -179,12 +179,18 @@
    </select>

    <select id="getDetailsList" resultType="com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsVo">
-        select wi.goodsSpuName, wi.goodsSkuCode, wi.warehouseName, wi.warehouseRackCode,abbv.vinNo,wib.supplierName as manufacturerName
+       <!-- select wi.goodsSpuName, wi.goodsSkuCode, wi.warehouseName, wi.warehouseRackCode,abbv.vinNo,wib.supplierName as manufacturerName
        from wms_inventory wi
                     LEFT JOIN wms_inventory_batch wib
                ON wi.sid = wib.`inventorySid`
                     LEFT JOIN yxt_4sas.as_busrepair_bill_vech abbv
                ON wib.billSid = abbv.`billSid`
+        where wi.sid = #{sid}-->
+        select wi.goodsSpuName, wi.goodsSkuCode, wi.warehouseName, wi.warehouseRackCode,abbv.vinNo,wi.manufacturerName
+        from wms_inventory wi
+        left join yxt_4sas.as_busrepair_inventorybill_detail d on d.oldInventorySid = wi.sid
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS abbv ON i.sourceBillSid = abbv.billSid
        where wi.sid = #{sid}
    </select>

--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
@ -599,6 +599,7 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                wmsUpdateCountQuery.setSid(kcSid);
                wmsUpdateCountQuery.setCount(wmsBusrepairInventorybillDetailOldApp.getCount());
                wmsUpdateCountQuery.setAddOrReduce(0);
+                wmsUpdateCountQuery.setGoodsCode(wmsBusrepairInventorybillDetailOldApp.getGoodsCode());
                wmsInventoryService.updateInventoryCount(wmsUpdateCountQuery);
            }else {
                WmsInventorySaveDto dto = new WmsInventorySaveDto();
@ -608,7 +609,11 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                dto.setGoodsSpuName(asBusrepairInventorybillDetail.getGoodsSpuName());
                dto.setGoodsSkuSid(asBusrepairInventorybillDetail.getGoodsSkuSid());
                dto.setGoodsSkuTitle(asBusrepairInventorybillDetail.getGoodsSkuTitle());
+                if(StringUtils.isNotBlank(wmsBusrepairInventorybillDetailOldApp.getGoodsCode())){
+                    dto.setGoodsSkuCode(wmsBusrepairInventorybillDetailOldApp.getGoodsCode());
+                }else{
                    dto.setGoodsSkuCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
+                }
                dto.setGoodsSkuOwnSpec(asBusrepairInventorybillDetail.getGoodsSkuOwnSpec());
                dto.setManufacturerSid(asBusrepairInventorybillDetail.getManufacturerSid());
                dto.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName());
@ -645,7 +650,11 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
            wmsInventoryRecord.setGoodsSpuName(asBusrepairInventorybillDetail.getGoodsSpuName());
            wmsInventoryRecord.setGoodsSkuSid(asBusrepairInventorybillDetail.getGoodsSkuSid());
            wmsInventoryRecord.setGoodsSkuTitle(asBusrepairInventorybillDetail.getGoodsSkuTitle());
+            if(StringUtils.isNotBlank(wmsBusrepairInventorybillDetailOldApp.getGoodsCode())){
+                wmsInventoryRecord.setGoodsSkuCode(wmsBusrepairInventorybillDetailOldApp.getGoodsCode());
+            }else{
                wmsInventoryRecord.setGoodsSkuCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
+            }
            wmsInventoryRecord.setGoodsSkuOwnSpec(asBusrepairInventorybillDetail.getGoodsSkuOwnSpec());
            wmsInventoryRecord.setCurrentCount(asBusrepairInventorybillDetail.getCount());
            wmsInventoryRecord.setUnit(asBusrepairInventorybillDetail.getUnit());