Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -1669,16 +1669,18 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
                 financeForm70.setValue("实际经营地址：" + loanHomevisitInvestigateCustomerDetailsVo.getAccCompxAddress());
                 financeForm70.setSpanSize(2);
                 otherInfo.add(financeForm70);
-                if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())) {
+                if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())){
-                    FinanceForm financeForm74 = new FinanceForm();
+                    if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())) {
-                    financeForm74.setValue("挂车或上装是否公司采购：是");
+                        FinanceForm financeForm74 = new FinanceForm();
-                    financeForm74.setSpanSize(2);
+                        financeForm74.setValue("挂车或上装是否公司采购：是");
-                    otherInfo.add(financeForm74);
+                        financeForm74.setSpanSize(2);
-                } else if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())) {
+                        otherInfo.add(financeForm74);
-                    FinanceForm financeForm74 = new FinanceForm();
+                    } else if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())) {
-                    financeForm74.setValue("挂车或上装是否公司采购：否");
+                        FinanceForm financeForm74 = new FinanceForm();
-                    financeForm74.setSpanSize(2);
+                        financeForm74.setValue("挂车或上装是否公司采购：否");
-                    otherInfo.add(financeForm74);
+                        financeForm74.setSpanSize(2);
+                        otherInfo.add(financeForm74);
+                    }
                 }
             }
         }

yxt-as-ui/src/api/Common/dictcommons.js

@@ -17,6 +17,16 @@ export function getTypeValueList(data) {
   })
 }
 
+// 获取所有分公司
+export function selectOrgSidList(data) {
+  return request({
+    url: '/portal/v1/sysorganization/selectOrgSidList',
+    method: 'get',
+    params: data
+  })
+}
+
+
 // 根据当前登录人orgSidPath(全路径sid)查询分公司
 export function getOrgSidByPath(data) {
   return request({

yxt-as-ui/src/api/storage/allocation.js

@@ -25,11 +25,21 @@ export default {
   // 初始化
   init: function(data) {
     return request({
-      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/' + data,
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data,
       method: 'get'
     });
   },
 
+  // 调拨
+  allocation: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/allocation',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    });
+  },
+
 
   // 查询所有商品
   getGoods: function(params) {

yxt-as-ui/src/api/storage/stocktaking.js

@@ -14,7 +14,7 @@ export default {
 // 新增、保存
   save: function(data) {
     return request({
-      url: '/wms/apiadmin/inventory/wmsinventorycheckbill/save',
+      url: '/wms/v1/wmsinventorycheckbill/save',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -24,7 +24,7 @@ export default {
   // 初始化
   init: function(data) {
     return request({
-      url: '/wms/apiadmin/inventory/wmsinventorycheckbill/' + data,
+      url: '/wms/v1/wmsinventorycheckbill/fetchDetailsBySid/' + data,
       method: 'get'
     });
   },
@@ -42,7 +42,7 @@ export default {
   // 盘点
   inven: function(params) {
     return request({
-      url: '/wms/apiadmin/inventory/wmsinventory/invenGoodsListPage',
+      url: '/wms/v1/wmsinventorycheckbill/inven',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }

yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@@ -5,7 +5,7 @@
         <div>{{ viewTitle }}</div>
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="settle()">调拨</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="confirm()">调拨</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -70,20 +70,20 @@
             <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
             <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
             <el-table-column prop="unit" label="单位" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-            <el-table-column prop="warehouseArea" label="库位" align="center" />
+            <el-table-column prop="warehouseRackCode" label="库位" align="center" />
             <el-table-column prop="stockCount" label="库存数量" align="center" />
-            <el-table-column label="调入仓库" align="center">
+            <el-table-column label="调入仓库" align="center" width="200">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.inWarehouseName" placeholder="请选择" @change="selectWarehouseName">
+                <el-select v-model="scope.row.inWarehouseName" placeholder="请选择" @change="selectWarehouseName(scope.row,$event)">
                   <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
                   </el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="调入库位" align="center">
+            <el-table-column label="调入库位" align="center" width="120">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择" @change="selectWarehouseAreaCode">
+                <el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择" @change="selectWarehouseAreaCode(scope.row,$event)">
                   <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
                   </el-option>
                 </el-select>
@@ -117,6 +117,10 @@
 
 <script>
   import req from '@/api/storage/allocation.js'
+  import {
+    getOrgSidByPath,
+    selectOrgSidList,
+  } from '@/api/Common/dictcommons'
   export default {
     data() {
       return {
@@ -146,7 +150,8 @@
           "billNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
           "createDate": "",
-          "createUserSid":window.sessionStorage.getItem('userSid'),
+          "createUserSid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
           "outOrgSid": "",
           "inOrgSid": "",
           "count": "",
@@ -154,32 +159,11 @@
           "confirmSid": "",
           "confirmName": "",
           "finishTime": "",
-          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "useOrgSid": '',
-          "createOrgName": window.sessionStorage.getItem('Orgname'),
           "wmsInventoryAllocateBillDetailNewList": []
         },
         rules: {},
-        orgList: [{
+        orgList: [],
-            name: "撒记得",
-            sid: "123"
-          },
-          {
-            name: "阿萨德",
-            sid: "12323"
-          },
-          {
-            name: "我饿请问请问",
-            sid: "23423"
-          },
-          {
-            name: "特尔味道",
-            sid: "1234"
-          },
-          {
-            name: "提问额外撒大声地",
-            sid: "12324233"
-          }
-        ],
         warehouseList: [],
         warehouseRackList: []
       }
@@ -260,15 +244,46 @@
           }
         })
       },
-      selectWarehouseName(val) {
+      selectWarehouseName(row,val) {
+        console.log("selectWarehouseName", row);
         console.log("selectWarehouseName", val);
 
+        const choose = this.warehouseList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectInOrg', choose)
+       row.inWarehouseSid= choose[0].sid
+       row.inWarehouseName = choose[0].warehouseName
+
         this.getWarehouseAreaList(val)
       },
-      selectWarehouseAreaCode(val) {
+      selectWarehouseAreaCode(row,val) {
+        console.log("selectWarehouseAreaCode", row);
         console.log("selectWarehouseAreaCode", val);
+
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectInOrg', choose)
+       row.inWarehouseRackSid = choose[0].sid
+       row.inWarehouseRackCode = choose[0].areaCode
+
       },
       showAdd() {
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+          }
+        })
+
+
+        selectOrgSidList().then((res) => {
+          if (res.success) {
+            console.log("selectOrgSidList", res);
+            this.orgList = res.data
+          }
+        })
+
+
         this.viewTitle = '【新增】调拨记录'
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
@@ -276,6 +291,25 @@
         this.getWarehouseList()
       },
       showEdit(row) {
+
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+          }
+        })
+
+
+        selectOrgSidList().then((res) => {
+          if (res.success) {
+            console.log("selectOrgSidList", res);
+            this.orgList = res.data
+          }
+        })
+
+
         this.viewTitle = '【修改】调拨记录'
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
@@ -284,8 +318,8 @@
           if (res.success) {
             this.formobj = res.data
 
-            this.commodityQuery.params.inOrg =  this.formobj.inOrgName
+            this.commodityQuery.params.inOrg = this.formobj.inOrgName
-            this.commodityQuery.params.outOrg =  this.formobj.outOrgName
+            this.commodityQuery.params.outOrg = this.formobj.outOrgName
           }
         })
         this.getWarehouseList()
@@ -320,8 +354,8 @@
           "unit": "",
           "warehouseSid": "",
           "warehouseName": "",
-          "warehouseAreasid": "",
+          "warehouseRackSid": "",
-          "warehouseArea": "",
+          "warehouseRackCode": "",
           "taxPrice": "",
           "stockCount": "",
           "inWarehouseSid": "",
@@ -358,20 +392,25 @@
         row.unit = value.unit
         row.warehouseName = value.warehouseName
         row.warehouseSid = value.warehouseSid
-        row.warehouseArea = value.warehouseRackCode
+        row.warehouseRackCode = value.warehouseRackCode
-        row.warehouseAreasid = value.warehouseRackSid
+        row.warehouseRackSid = value.warehouseRackSid
         row.taxPrice = value.taxPrice
         row.stockCount = value.count
-        row.count = ''
+        // row.count = ''
-        row.amount = ''
+        // row.amount = ''
         document.body.click()
+        this.commodityComputeYHAndXSJE(row, row.count)
+
       },
       // 计算优惠、销售金额
       commodityComputeYHAndXSJE(row, val) {
 
         console.log("aaaaaaaaa", row);
         console.log("aaaaaaaaa", val);
-        Number()
+
+
+        row.count = val
+
         if (Number(row.stockCount) < Number(row.count)) {
           row.count = ''
           row.amount = ''
@@ -411,12 +450,12 @@
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {
             this.submitdisabled = true
-            req.settlement(this.formobj).then((res) => {
+            req.allocation(this.formobj).then((res) => {
               if (res.success) {
                 this.$message({
                   showClose: true,
                   type: 'success',
-                  message: '结算成功'
+                  message: '调拨成功'
                 })
                 this.handleReturn('true')
               } else {
@@ -431,21 +470,21 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
-          "sid": "",
+         "sid": "",
-          "billNo": "",
+         "billNo": "",
-          "createBySid": "",
+         "createBySid": window.sessionStorage.getItem('userSid'),
-          "createDate": "",
+         "createDate": "",
-          "createUserSid": "",
+         "createUserSid": window.sessionStorage.getItem('userSid'),
-          "outOrgSid": "",
+         "createByName": window.sessionStorage.getItem('name'),
-          "inOrgSid": "",
+         "outOrgSid": "",
-          "count": "",
+         "inOrgSid": "",
-          "amount": "",
+         "count": "",
-          "confirmSid": "",
+         "amount": "",
-          "confirmName": "",
+         "confirmSid": "",
-          "finishTime": "",
+         "confirmName": "",
-          "useOrgSid": "",
+         "finishTime": "",
-          "createOrgName": "",
+         "useOrgSid": '',
-          "wmsInventoryAllocateBillDetailNewList": []
+         "wmsInventoryAllocateBillDetailNewList": []
         }
         this.commodityQuery.params.inOrg = ''
         this.commodityQuery.params.outOrg = ''

yxt-as-ui/src/views/storage/allocation/index.vue

@@ -50,10 +50,15 @@
             <el-table-column prop="billNo" label="单据编号" align="center" />
             <el-table-column prop="createDate" label="单据日期" align="center" />
             <el-table-column prop="createByName" label="制单人姓名" align="center" />
-            <el-table-column prop="state" label="完成标志" align="center" />
+            <!-- <el-table-column prop="state" label="完成标志" align="center" /> -->
+            <el-table-column  label="完成标志" align="center" width="180">
+              <template slot-scope="scope">
+                <span>{{scope.row.state=='1'?'未完成':'已完成'}}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="finishTime" label="完成时间" align="center" />
-            <el-table-column prop="outOrg" label="调出门店" align="center" />
+            <el-table-column prop="outOrgName" label="调出门店" align="center" />
-            <el-table-column prop="inOrg" label="调入门店" align="center" />
+            <el-table-column prop="inOrgName" label="调入门店" align="center" />
             <el-table-column prop="count" label="调拨数量" align="center" />
             <el-table-column prop="amount" label="调拨金额" align="center" />
             <el-table-column prop="createOrgName" label="门店" align="center" />
@@ -228,6 +233,16 @@
           return
         }
 
+        if(this.selectionList[0].state=='2'){
+          this.$message({
+            type: 'warning',
+            message: "此记录已完成,不可重复编辑。",
+            showClose: true
+          })
+          return
+        }
+
+
         this.viewState = 3
         this.$refs['divadd'].showEdit(this.selectionList[0])
       },

yxt-as-ui/src/views/storage/stocktaking/index.vue

@@ -218,7 +218,7 @@
           return
         }
 
-        if(this.selectionList[0].checkState!=1){
+        if(this.selectionList[0].checkState==2){
           this.$message({
             type: 'warning',
             message: "此记录已完成,不可重复编辑。",

yxt-as-ui/src/views/storage/stocktaking/stocktakingAdd.vue

@@ -25,7 +25,7 @@
                 <i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
               </template>
             </el-table-column>
-            <el-table-column label="商品名称" align="center" min-width="200">
+            <el-table-column label="商品名称" align="center" min-width="180">
               <template slot-scope="scope">
                 <el-popover placement="right" width="900" trigger="click">
                   <div>
@@ -35,7 +35,7 @@
                       <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
                       <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
                       <el-table-column prop="unit" label="单位" align="center" />
-                      <el-table-column prop="warehouseName" label="仓库" align="center" />
+                      <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
                       <el-table-column prop="warehouseRackCode" label="库位" align="center" />
                       <el-table-column prop="count" label="账面数量" align="center" />
                     </el-table>
@@ -49,10 +49,10 @@
             </el-table-column>
             <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
             <el-table-column prop="carModel" label="型号" align="center" />
-            <el-table-column prop="unit" label="单位" align="center" />
+            <el-table-column prop="unit" label="单位"width="70" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="150"  align="center" />
-            <el-table-column prop="warehouseRackCode" label="货位" align="center" />
+            <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-            <el-table-column prop="taxPrice" label="单价" align="center" />
+            <el-table-column prop="cost" label="单价" align="center" />
             <el-table-column prop="bookCount" label="账面数量" align="center" />
             <el-table-column label="实盘数量" align="center">
               <template slot-scope="scope">
@@ -61,7 +61,7 @@
                   oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </template>
             </el-table-column>
-            <el-table-column prop="state" label="状态" align="center" width="100" />
+            <el-table-column prop="stateValue" label="状态" align="center" width="100" />
             <el-table-column prop="profitandlossNumber" label="盈亏数" align="center" width="100" />
             <el-table-column prop="profitandlossAmount" label="盈亏金额" align="center" width="100" />
           </el-table>
@@ -85,6 +85,9 @@
 
 <script>
   import req from '@/api/storage/stocktaking.js'
+  import {
+    getOrgSidByPath,
+  } from '@/api/Common/dictcommons'
   export default {
     data() {
       return {
@@ -119,8 +122,8 @@
           "profitAmount": "",
           "lossCount": "",
           "lossAmount": "",
-          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "useOrgSid": '',
-          "createOrgSid": window.sessionStorage.getItem('orgSid'),
+          "createOrgSid": '',
           "wmsInventoryCheckbillDetailList": [
 
           ]
@@ -147,7 +150,7 @@
         let material = 0
         this.formobj.wmsInventoryCheckbillDetailList.forEach((e) => {
           if (Number(e.bookCount) < Number(e.realCount)) {
-            material += (e.realCount - e.bookCount) * e.taxPrice
+            material += (e.realCount - e.bookCount) * e.cost
           }
         })
         this.formobj.profitAmount = material.toFixed(2)
@@ -173,7 +176,7 @@
         let material = 0
         this.formobj.wmsInventoryCheckbillDetailList.forEach((e) => {
           if (Number(e.bookCount) > Number(e.realCount)) {
-            material += (e.realCount - e.bookCount) * e.taxPrice
+            material += (e.realCount - e.bookCount) * e.cost
           }
         })
 
@@ -181,15 +184,36 @@
 
         return material.toFixed(2)
       },
+    },
+    created() {
+
     },
     methods: {
       showAdd() {
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+          }
+        })
+
         this.viewTitle = '【新增】盘点记录'
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })
       },
       showEdit(row) {
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+          }
+        })
+
         this.viewTitle = '【修改】盘点记录'
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
@@ -226,6 +250,7 @@
       commodityAdd() {
         this.formobj.wmsInventoryCheckbillDetailList.push({
           "sid": "",
+          "stateValue": "",
           "state": "",
           "billSid": "",
           "inventorySid": "",
@@ -233,7 +258,7 @@
           "warehouseName": "",
           "warehouseRackSid": "",
           "warehouseRackCode": "",
-          "taxPrice": "",
+          "cost": "",
           "bookCount": "",
           "realCount": "",
           "profitandlossNumber": "",
@@ -260,19 +285,24 @@
         this.formobj.wmsInventoryCheckbillDetailList.splice(index, 1)
       },
       commodityCurrentChange(value, row) {
-        row.sid = value.sid
+        console.log('>>>>>>>>>commodityCurrentChange', value)
-        row.goodsName = value.goodsSpuName
+
+        row.sid = ''
+        // row.inventorySid = value.sid
+        row.goodsSpuSid = value.sid
+        row.goodsSpuName = value.goodsSpuName
         row.goodsSkuCode = value.goodsSkuCode
-        row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
+        row.carModel = value.goodsSkuOwnSpec
         row.unit = value.unit
         row.warehouseName = value.warehouseName
         row.warehouseSid = value.warehouseSid
+        row.warehouseRackSid = value.warehouseRackSid
         row.warehouseRackCode = value.warehouseRackCode
         row.bookCount = value.count
-        row.taxPrice = value.salesPrice
+        row.cost = value.salesPrice
-        row.realCount = ""
+        // row.realCount = ""
-        row.profitandlossNumber = ""
+        // row.profitandlossNumber = ""
-        row.profitandlossAmount = ""
+        // row.profitandlossAmount = ""
         document.body.click()
       },
       // 计算状态 盈亏数量 盈亏金额
@@ -283,23 +313,26 @@
 
         // 正常
         if (Number(row.bookCount) == Number(val)) {
-          row.state = "正常"
+          row.stateValue = "正常"
+          row.state = 0
           row.profitandlossNumber = "0"
           row.profitandlossAmount = "0.00"
         }
 
         // 盘盈
         if (Number(row.bookCount) < Number(val)) {
-          row.state = "盘盈"
+          row.stateValue = "盘盈"
+          row.state = 1
           row.profitandlossNumber = val - row.bookCount
-          row.profitandlossAmount = ((val - row.bookCount) * row.taxPrice).toFixed(2)
+          row.profitandlossAmount = ((val - row.bookCount) * row.cost).toFixed(2)
         }
 
         // 盘亏
         if (Number(row.bookCount) > Number(val)) {
-          row.state = "盘亏"
+          row.stateValue = "盘亏"
+          row.state = 2
           row.profitandlossNumber = val - row.bookCount
-          row.profitandlossAmount = ((val - row.bookCount) * row.taxPrice).toFixed(2)
+          row.profitandlossAmount = ((val - row.bookCount) * row.cost).toFixed(2)
         }
 
       },
@@ -373,20 +406,20 @@
         this.formobj = {
           "sid": "",
           "remarks": "",
-          "createBySid": "",
+          "billNo": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName":window.sessionStorage.getItem('name'),
           "createDate": "",
-          "createUserSid": "",
+          "createUserSid": window.sessionStorage.getItem('userSid'),
-          "createByName": "",
           "checkType": "",
-          "checkState": "",
-          "profitCount": "",
           "profitAmount": "",
           "lossCount": "",
           "lossAmount": "",
-          "useOrgSid": "",
+          "useOrgSid": '',
-          "createOrgName": "",
+          "createOrgSid": '',
-          "createOrgSid": "",
+          "wmsInventoryCheckbillDetailList": [
-          "wmsInventoryCheckbillDetailList": []
+
+          ]
         }
         this.submitdisabled = false
         this.settleVisible = false

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -226,7 +226,8 @@
         wi.warehouseRackSid,
         wi.warehouseRackCode,
         wwa.areaName,
-        wi.count
+        wi.count,
+        wi.cost as salesPrice
         FROM wms_inventory wi
         LEFT JOIN wms_warehouse_area wwa
         ON wi.`warehouseRackSid` = wwa.`sid`
@@ -246,7 +247,8 @@
         wi.warehouseRackSid,
         wi.warehouseRackCode,
         wwa.areaName,
-        wi.count
+        wi.count,
+        wi.cost as taxPrice
         FROM wms_inventory wi
         LEFT JOIN wms_warehouse_area wwa
         ON wi.`warehouseRackSid` = wwa.`sid`

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBill.java

@@ -1,5 +1,6 @@
 package com.yxt.wms.biz.inventory.wmsinventoryallocatebill;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -18,7 +19,9 @@ public class WmsInventoryAllocateBill extends BaseEntity {
     private String createUserSid;//制单人sid
     private String createByName;//制单人姓名
     private String outOrgSid;//调出分公司sid
+    private String outOrgName;//调出分公司
     private String inOrgSid;//调入分公司sid
+    private String inOrgName;//调入分公司
     private String count;//调拨数量
     private String amount;//调拨金额
     private String confirmSid;//确认人sid
@@ -27,5 +30,6 @@ public class WmsInventoryAllocateBill extends BaseEntity {
     private Date finishTime;//完成时间
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String createOrgName;//创建组织名称
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java

@@ -69,8 +69,12 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo {
     private String billNo;
     @ApiModelProperty("调出分公司sid")
     private String outOrgSid;
+    @ApiModelProperty("调出分公司sid")
+    private String outOrgName;
     @ApiModelProperty("调入分公司sid")
     private String inOrgSid;
+    @ApiModelProperty("调入分公司sid")
+    private String inOrgName;
     @ApiModelProperty("调拨数量")
     private BigDecimal count;
     @ApiModelProperty("调拨金额")
@@ -84,16 +88,10 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo {
     private Date finishTime;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
+    @ApiModelProperty("创建组织")
+    private String createOrgName;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("调拨单商品明细")
     private List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocateBillDetailNewList;
-
-    /*
-    * 页面展示
-    * */
-    @ApiModelProperty("调出分公司名称")
-    private String outOrgName;
-    @ApiModelProperty("调入分公司名称")
-    private String inOrgName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java

@@ -21,6 +21,8 @@ public class WmsInventoryAllocateBillDtoNew implements Dto {
 
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("制单日期")
+    private String createDate;
     @ApiModelProperty("制单人sid")
     private String createBySid;
     @ApiModelProperty("制单人姓名")
@@ -29,8 +31,12 @@ public class WmsInventoryAllocateBillDtoNew implements Dto {
     private String billNo;
     @ApiModelProperty("调出分公司sid")
     private String outOrgSid;
+    @ApiModelProperty("调出分公司sid")
+    private String outOrgName;
     @ApiModelProperty("调入分公司sid")
     private String inOrgSid;
+    @ApiModelProperty("调入分公司sid")
+    private String inOrgName;
     @ApiModelProperty("调拨数量")
     private BigDecimal count;
     @ApiModelProperty("调拨金额")
@@ -46,14 +52,8 @@ public class WmsInventoryAllocateBillDtoNew implements Dto {
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    @ApiModelProperty("创建组织")
+    private String createOrgName;
     @ApiModelProperty("调拨单商品明细")
     private List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList;
-
-    /*
-     * 页面展示
-     * */
-    @ApiModelProperty("调出分公司名称")
-    private String outOrgName;
-    @ApiModelProperty("调入分公司名称")
-    private String inOrgName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @author wangpengfei
@@ -17,4 +18,9 @@ public interface WmsInventoryAllocateBillMapper extends BaseMapper<WmsInventoryA
     WmsInventoryAllocateBillVo initialization (@Param("sid") String sid);
 
     IPage<WmsInventoryAllocateBillVoNew> selectPageVo(IPage<WmsInventoryAllocateBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryAllocateBill> qw);
+
+    String selectNum(String billNo);
+
+    @Update("update wms_inventory_allocate_bill set state = '2',finishTime = NOW() where sid = #{sid}")
+    void updateState(String sid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml

@@ -23,6 +23,17 @@
 
     <select id="selectPageVo"
             resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebill.WmsInventoryAllocateBillVoNew">
+        select * from wms_inventory_allocate_bill
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from wms_inventory_allocate_bill
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+                limit 1
     </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java

@@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsinventoryallocatebill;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -13,6 +14,9 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailDtoNew;
 import com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailService;
 import com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.wms.utils.Rule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +32,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
 
     @Autowired
     private WmsInventoryAllocateBillDetailService wmsInventoryAllocateBillDetailService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public ResultBean<PagerVo<WmsInventoryAllocateBillVo>> listPage(PagerQuery<WmsInventoryAllocateBillQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -157,23 +163,38 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         }
     }
 
-    public void saveOrUpdateDto(WmsInventoryAllocateBillDtoNew dto) {
+    public String saveOrUpdateDto(WmsInventoryAllocateBillDtoNew dto) {
         String dtoSid = dto.getSid();
         List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList();
         if (StringUtils.isBlank(dtoSid)) {
+            //生成单据编号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+            billNo = "DB" + sysOrganizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            dto.setBillNo(billNo);
+            dto.setCreateDate(DateUtil.today());
+            dto.setCreateOrgName(sysOrganizationVo.getName());
             String sid = this.insertByDto(dto);
             for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
                 wmsInventoryAllocateBillDetailDtoNew.setBillSid(sid);
                 wmsInventoryAllocateBillDetailService.saveOrUpdateDto(wmsInventoryAllocateBillDetailDtoNew);
             }
-            return;
+            return sid;
         }
         this.updateByDto(dto);
         wmsInventoryAllocateBillDetailService.delByMainSid(dtoSid);
         for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
             wmsInventoryAllocateBillDetailDtoNew.setBillSid(dtoSid);
-            wmsInventoryAllocateBillDetailService.saveOrUpdateDto(wmsInventoryAllocateBillDetailDtoNew);
+            wmsInventoryAllocateBillDetailService.insertByDto(wmsInventoryAllocateBillDetailDtoNew);
         }
+        return dtoSid;
     }
 
     public String insertByDto(WmsInventoryAllocateBillDtoNew dto) {
@@ -191,6 +212,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
     }
 
     public void allocation(WmsInventoryAllocateBillDtoNew dto) {
-
+        String sid = saveOrUpdateDto(dto);
+        baseMapper.updateState(sid);
     }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillVoNew.java

@@ -41,9 +41,9 @@ public class WmsInventoryAllocateBillVoNew implements Vo {
     @ApiModelProperty("完成时间")
     private Date finishTime;
     @ApiModelProperty("调出门店")
-    private String outOrg;
+    private String outOrgName;
     @ApiModelProperty("调入门店")
-    private String inOrg;
+    private String inOrgName;
     @ApiModelProperty("调拨数量")
     private BigDecimal count;
     @ApiModelProperty("调拨金额")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetail.java

@@ -34,6 +34,8 @@ public class WmsInventoryAllocateBillDetail extends BaseEntity {
     private String stockCount;//首保价格
     private String inWarehouseSid;//仓库sid
     private String inWarehouseName;//仓库名称
+    private String warehouseRackSid;//调入库位sid
+    private String warehouseRackCode;//调入库位编码
     private String count;//货位
     private String amount;//是否显示折扣标志
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.java

@@ -20,7 +20,7 @@ public interface WmsInventoryAllocateBillDetailMapper extends BaseMapper<WmsInve
     IPage<WmsInventoryAllocateBillDetailVo> listPage(IPage<WmsInventoryAllocateBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryAllocateBillDetail> qw);
     WmsInventoryAllocateBillDetailVo initialization (@Param("sid") String sid);
 
-    @Delete("delete from wms_inventory_allocatebill_detail where billSid = #{billSid}")
+    @Delete("delete from wms_inventory_allocate_bill_detail where billSid = #{billSid}")
     void delByMainSid(String billSid);
 
     List<WmsInventoryAllocatebillDetailDetailsVoNew> selByMainSid(String billSid);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml

@@ -25,12 +25,20 @@
             resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew">
         SELECT
                 wiad.*,
+                wiad.outWarehouseSid as warehouseSid,
+                wiad.outWarehouseName as warehouseName,
+                wiad.warehouseAreasid as warehouseRackSid,
+                wiad.warehouseArea as warehouseRackCode,
+                wiad.inWarehouseSid as inWarehouseSid,
+                wiad.inWarehouseName as inWarehouseName,
+                wiad.warehouseRackSid as inWarehouseRackSid,
+                wiad.warehouseRackCode as inWarehouseRackCode,
                 wi.goodsSpuName,
                 wi.goodsSkuCode,
                 wi.goodsSkuOwnSpec,
                 wi.unit
         FROM
-                wms_inventory_allocatebill_detail wiad
+                wms_inventory_allocate_bill_detail wiad
                         LEFT JOIN wms_inventory wi
                         ON wiad.inventorySid = wi.`sid`
         WHERE billSid = #{billSid}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java

@@ -145,6 +145,14 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
     public void insertByDto(WmsInventoryAllocateBillDetailDtoNew dto) {
         WmsInventoryAllocateBillDetail entity = new WmsInventoryAllocateBillDetail();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setOutWarehouseSid(dto.getWarehouseSid());
+        entity.setOutWarehouseName(dto.getWarehouseName());
+        entity.setWarehouseAreasid(dto.getWarehouseRackSid());
+        entity.setWarehouseArea(dto.getWarehouseRackCode());
+        entity.setInWarehouseSid(dto.getInWarehouseSid());
+        entity.setInWarehouseName(dto.getInWarehouseName());
+        entity.setWarehouseRackSid(dto.getInWarehouseRackSid());
+        entity.setWarehouseRackCode(dto.getInWarehouseRackCode());
         baseMapper.insert(entity);
     }
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbill.java

@@ -54,6 +54,8 @@ public class WmsInventoryCheckbill extends BaseEntity {
 
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
+    @ApiModelProperty("制单日期")
+    private String createDate;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
 	@ApiModelProperty("盘点类型")
@@ -70,7 +72,10 @@ public class WmsInventoryCheckbill extends BaseEntity {
     private BigDecimal lossAmount; // 盈亏金额
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-
+    @ApiModelProperty("完成时间")
+    private String completeDate;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java

@@ -56,6 +56,8 @@ public class WmsInventoryCheckbillDetailsVo implements Vo {
 
     private String sid;
 
+    @ApiModelProperty("制单日期")
+    private String createDate;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("制单人sid")
@@ -78,6 +80,8 @@ public class WmsInventoryCheckbillDetailsVo implements Vo {
     private BigDecimal lossAmount;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("盘库明细")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java

@@ -55,6 +55,8 @@ public class WmsInventoryCheckbillDto implements Dto {
 
     private String sid;
 
+    @ApiModelProperty("制单日期")
+    private String createDate;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("制单人sid")
@@ -77,6 +79,8 @@ public class WmsInventoryCheckbillDto implements Dto {
     private BigDecimal lossAmount;
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("盘库明细")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -57,4 +58,9 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
 	
 	@Select("select * from wms_inventory_checkbill")
 	List<WmsInventoryCheckbillVo> selectListVo();
+
+    String selectNum(String billNo);
+
+	@Update("update wms_inventory_checkbill set checkState = '2',completeDate = NOW() where sid = #{sid}")
+	void updateCheckState(String sid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml

@@ -10,4 +10,12 @@
 	<select id="selectListAllVo" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillVo">
 		SELECT * FROM wms_inventory_checkbill <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="selectNum" resultType="java.lang.String">
+		select RIGHT (billNo, 4)
+		from wms_inventory_checkbill
+		where billNo LIKE concat(#{billNo}, '%')
+		order by billNo desc
+				limit 1
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java

@@ -26,11 +26,15 @@
 package com.yxt.wms.biz.inventory.wmsinventorycheckbill;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.wms.utils.Rule;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -61,6 +65,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
 
 	@Autowired
 	private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
 	
 	public PagerVo<WmsInventoryCheckbillVo> listPageVo(PagerQuery<WmsInventoryCheckbillQuery> pq) {
 		WmsInventoryCheckbillQuery query = pq.getParams();
@@ -87,23 +93,38 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
 		return p;
 	}
 	
-	public void saveOrUpdateDto(WmsInventoryCheckbillDto dto){
+	public String saveOrUpdateDto(WmsInventoryCheckbillDto dto){
         String dtoSid = dto.getSid();
 		List<WmsInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList();
 		if (StringUtils.isBlank(dtoSid)) {
+			//生成单据编号
+			String billNo = "";
+			String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+			billNo = "PD" + sysOrganizationVo.getOrgCode() + date;
+			String i = baseMapper.selectNum(billNo);
+			if (StringUtils.isNotBlank(i)) {
+				billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+			} else {
+				billNo = Rule.getBillNo(billNo, 0);
+			}
+			dto.setBillNo(billNo);
+			dto.setCreateDate(DateUtil.today());
+			dto.setCreateOrgName(sysOrganizationVo.getName());
 			String sid = this.insertByDto(dto);
 			for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
 				wmsInventoryCheckbillDetailDto.setBillSid(sid);
 				wmsInventoryCheckbillDetailService.saveOrUpdateDto(wmsInventoryCheckbillDetailDto);
 			}
-			return;
+			return sid;
         } 
 		this.updateByDto(dto);
 		wmsInventoryCheckbillDetailService.delByMainSid(dtoSid);
 		for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
 			wmsInventoryCheckbillDetailDto.setBillSid(dtoSid);
-			wmsInventoryCheckbillDetailService.saveOrUpdateDto(wmsInventoryCheckbillDetailDto);
+			wmsInventoryCheckbillDetailService.insertByDto(wmsInventoryCheckbillDetailDto);
 		}
+		return dtoSid;
 	}
 	
 	public String insertByDto(WmsInventoryCheckbillDto dto){
@@ -133,10 +154,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
 	}
 
 	public void inven(WmsInventoryCheckbillDto dto) {
-		saveOrUpdateDto(dto);
+		String sid = saveOrUpdateDto(dto);
-		List<WmsInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList();
+		baseMapper.updateCheckState(sid);
-		for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
-
-		}
 	}
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java

@@ -53,16 +53,34 @@ public class WmsInventoryCheckbillDetail extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("盘点单sid")
-    private String billSid; // 盘点单sid
+    private String billSid;
 	@ApiModelProperty("商品库存sid")
-    private String inventorySid; // 商品库存sid
+    private String inventorySid;
+    @ApiModelProperty("商品sid")
+    private String goodsSid;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("商品编码（图号）")
+    private String goodsCode;
+    @ApiModelProperty("型号")
+    private String goodsModel;
+    @ApiModelProperty("单价")
+    private BigDecimal cost;
+    @ApiModelProperty("单位")
+    private String unit;
 	@ApiModelProperty("仓库sid")
-    private String warehouseSid; // 仓库sid
+    private String warehouseSid;
-	@ApiModelProperty("仓库")
+	@ApiModelProperty("仓库名称")
-    private String warehouseName; // 仓库
+    private String warehouseName;
-	@ApiModelProperty("库位sid")
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
+	@ApiModelProperty("货架sid")
     private String warehouseRackSid;
-    @ApiModelProperty("库位编码")
+    @ApiModelProperty("货架名称")
+    private String warehouseRackName;
+    @ApiModelProperty("货架编码")
     private String warehouseRackCode;
 	@ApiModelProperty("含税价")
     private BigDecimal taxPrice; // 含税价
@@ -70,6 +88,10 @@ public class WmsInventoryCheckbillDetail extends BaseEntity {
     private BigDecimal bookCount; // 账面数量
 	@ApiModelProperty("实盘数量")
     private BigDecimal realCount; // 实盘数量
+    @ApiModelProperty("盈亏数（实盘数量-账面数量）")
+    private BigDecimal profitandlossNumber;
+    @ApiModelProperty("盈亏金额（盈亏数*含税价）")
+    private BigDecimal profitandlossAmount;
 	@ApiModelProperty("现场照片（多张中间用英文逗号分隔）")
     private String picUrl; // 现场照片（多张中间用英文逗号分隔）
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java

@@ -83,9 +83,8 @@ public class WmsInventoryCheckbillDetailDetailsVo implements Vo {
     @ApiModelProperty("现场照片")
     private List<String> picUrls = new ArrayList<>();
 
-    /*
+    @ApiModelProperty("商品sid")
-    * 页面展示字段
+    private String goodsSpuSid;
-    * */
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("零件号")
@@ -94,7 +93,8 @@ public class WmsInventoryCheckbillDetailDetailsVo implements Vo {
     private String carModel;
     @ApiModelProperty("商品单位")
     private String unit;
-
+    @ApiModelProperty("单价")
+    private String cost;
     /*
     * 盘点接口需要字段
     * */

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java

@@ -83,9 +83,8 @@ public class WmsInventoryCheckbillDetailDto implements Dto {
     @ApiModelProperty("现场照片")
     private List<String> picUrls = new ArrayList<>();
 
-    /*
+    @ApiModelProperty("商品sid")
-     * 页面展示字段
+    private String goodsSpuSid;
-     * */
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("零件号")
@@ -94,7 +93,8 @@ public class WmsInventoryCheckbillDetailDto implements Dto {
     private String carModel;
     @ApiModelProperty("商品单位")
     private String unit;
-
+    @ApiModelProperty("单价")
+    private String cost;
     /*
      * 盘点接口需要字段
      * */

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml

@@ -15,10 +15,10 @@
             resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo">
 		SELECT
 				wicd.*,
-				wi.goodsSpuName,
+			    wicd.goodsModel as carModel,
-				wi.goodsSkuCode,
+				wicd.goodsSid as goodsSpuSid,
-				wi.goodsSkuOwnSpec,
+			    wicd.goodsName as goodsSpuName,
-				wi.unit
+				wicd.goodsCode as goodsSkuCode
 		FROM
 				wms_inventory_checkbill_detail wicd
 						LEFT JOIN wms_inventory wi

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java

@@ -75,6 +75,10 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
 	public void insertByDto(WmsInventoryCheckbillDetailDto dto){
 		WmsInventoryCheckbillDetail entity = new WmsInventoryCheckbillDetail();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setGoodsSid(dto.getGoodsSpuSid());
+		entity.setGoodsCode(dto.getGoodsSkuCode());
+		entity.setGoodsName(dto.getGoodsSpuName());
+		entity.setGoodsModel(dto.getCarModel());
 		baseMapper.insert(entity);
 	}