盘点明细可以添加盘盈的物料子明细

李泰瑜
1 parent 12bacbdc
Showing 6 changed files with 207 additions and 16 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountDetailList.vue
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailChiIdModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/ICycleCountDetailService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
@@ -159,6 +159,8 @@ export const selectPort = (params) =&gt; postAction(&#39;/task/taskHeader/selectPort&#39;, 
 export const createOverStationTask = (params) => postAction('/task/taskHeader/createOverStationTask', params);
 //盘点任务创建
 export const stockTakeTask = (params,headerId,code) => postAction('/cycleCountDetail/cycleCountDetail/stockTakeTask?ids='+params+'&headerId='+headerId+'&code='+code, code);
+//盘盈添加
+export const increaseInInventoryGain = (params) => postAction('/cycleCountDetail/cycleCountDetail/increaseInInventoryGain', params);
 //盘点任务生成
 export const createCycleCoutTaskByDetailId = (params,toPort) => postAction('/cycleCountDetail/cycleCountDetail/createCycleCoutTaskByDetailId?cycleId='+params+'&toPort='+toPort, params);
 //盘点确定实盘数量
@@ -72,8 +72,11 @@
             <span>下载</span>
           </a-button>
         </template>
-
+        CycleCountDetailChiIdModal
         <template slot="action" slot-scope="text, record">
+          <cycle-count-detail-chi-id-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id"/>
+          <a @click="createMany()"><a-icon/>新增</a>
+          <a-divider type="vertical"/>
           <a v-if="record.enableStatus === 1"  @click="selectPort(record)">生成盘点任务</a>
           <a-divider v-if="record.enableStatus === 1"  type="vertical"/>
           <a @click="loadDatas(record.cycleCountHeadId)"><a-icon type="sync"/>刷新</a>
@@ -101,6 +104,7 @@
   import '@/assets/less/TableExpand.less'
   import {createCycleCoutTaskByDetailId, stockTakeTask} from "../../../api/api";
   import Utils from "../../../components/jeecgbiz/JButtonBizComponent/util.js"
+  import CycleCountDetailChiIdModal from "./modules/CycleCountDetailChiIdModal";
  
   export default {
     name: 'CycleCountDetailList',
@@ -110,6 +114,7 @@
       CycleCountDetailModal,
       CycleCountDetailChildSubTable,
       CycleCountSelectModal,
+      CycleCountDetailChiIdModal,
     },
     props: {
       record: {
@@ -333,7 +338,12 @@
         fieldList.push({type:'string',value:'completedAt',text:'完成时间',dictCode:''})
         fieldList.push({type:'string',value:'enableStatus',text:'盘点明细状态',dictCode:''})
         this.superFieldList = fieldList
-      }
+      },
+
+      createMany() {
+        this.$refs.adjustmentModal.edit();
+        this.$refs.adjustmentModal.title = "实盘登记";
+      },
     }
   }
 </script>
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+        <a-row>
+          <a-col :xs="24">
+            <a-form-model-item label="物料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
+              <j-search-select-tag
+                v-model="model.materialCode"
+                :dictOptions="materialList"
+                :trigger-change="true"
+                placeholder="请选择物料编码"
+                @change="searchMaterial">
+              </j-search-select-tag>
+            </a-form-model-item>
+          </a-col>
+          <a-col :xs="24">
+            <a-form-model-item label="实盘数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="countedQty">
+              <a-input v-model="model.countedQty" placeholder="请输入实盘数量"></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="库存状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryStatus">
+              <j-dict-select-tag type="list" v-model="model.inventoryStatus" dictCode="inventory_status"
+                                 placeholder="请选择库存状态"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :xs="24">
+            <a-form-model-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batch">
+              <a-input v-model="model.batch" placeholder="请输入批次"></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+
+import {createManyEmptyIn} from '@/api/api'
+import {increaseInInventoryGain} from "../../../../api/api";
+import {searchMaterialByCode} from '@/api/api';
+import Utils from '../../../../components/jeecgbiz/JButtonBizComponent/util.js';
+
+export default {
+  name: "CycleCountDetailChiIdModal",
+  components: {},
+  props: {
+    id: "",
+  },
+  data() {
+    return {
+      title: "操作",
+      width: 500,
+      visible: false,
+      model: {
+        cycleCountDetailid:this.id,
+        materialCode:'',
+        batch:'',
+        countedQty:'',
+      },
+      materialList: {},
+      querySource: {},
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5},
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 16},
+      },
+
+      confirmLoading: false,
+      validatorRules: {
+        countedQty: [
+          {required: true, message: '请输入实盘数量!'},
+        ],
+      },
+      url: {
+        add: "/cycleCountDetail/cycleCountDetail/increaseInInventoryGain",
+      }
+
+    }
+  },
+
+
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    this.searchMaterial();
+    this.model.inventoryStatus = "good";
+  },
+
+  methods: {
+    searchMaterial() {
+      const that = this;
+      that.querySource.materialCode = that.model.materialCode;
+      searchMaterialByCode(that.querySource).then((res) => {
+        that.materialList = res.result;
+      })
+    },
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit() {
+      this.visible = true;
+    },
+    close() {
+      this.$emit('close');
+      this.visible = false;
+      this.$refs.form.clearValidate();
+    },
+    handleOk() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true;
+          increaseInInventoryGain(this.model).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message);
+              that.$emit('ok');
+              that.model.containerCode = '';
+              that.model.toLocationCode = '';
+              Utils.$emit('methodB',res.result);
+            } else {
+              that.$message.warning(res.message);
+            }
+          }).finally(() => {
+            that.confirmLoading = false;
+            that.close();
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+
+
+  }
+}
+</script>
 \ No newline at end of file
@@ -131,23 +131,16 @@ public class CycleCountDetailController  extends HuahengBaseController {
 	}
  
 	/**
-	 *  编辑
+	 *  盘盈增加明细
 	 *
-	 * @param cycleCountDetailPage
+	 * @param
 	 * @return
 	 */
-	@AutoLog(value = "盘点明细表-编辑")
-	@ApiOperation(value="盘点明细表-编辑", notes="盘点明细表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CycleCountDetailPage cycleCountDetailPage) {
-		CycleCountDetail cycleCountDetail = new CycleCountDetail();
-		BeanUtils.copyProperties(cycleCountDetailPage, cycleCountDetail);
-		CycleCountDetail cycleCountDetailEntity = cycleCountDetailService.getById(cycleCountDetail.getId());
-		if(cycleCountDetailEntity==null) {
-			return Result.error("未找到对应数据");
-		}
-		cycleCountDetailService.updateMain(cycleCountDetail, cycleCountDetailPage.getCycleCountDetailChildList());
-		return Result.OK("编辑成功!");
+	@AutoLog(value = "盘点盘盈-增加明细")
+	@ApiOperation(value="盘点盘盈-增加明细", notes="盘点盘盈-增加明细")
+	@RequestMapping(value = "/increaseInInventoryGain", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> increaseInInventoryGain(@RequestBody CycleCountDetailChild cycleCountDetailChild) {
+		return cycleCountDetailService.increaseInInventoryGain(cycleCountDetailChild);
 	}
  
 	/**
@@ -42,4 +42,5 @@ public interface ICycleCountDetailService extends IService&lt;CycleCountDetail&gt; {
  
 	Result createCycleCoutTaskByDetailId(Integer cycleCoutdetailId,String toPort,String warehouseCode);
  
+    Result increaseInInventoryGain(CycleCountDetailChild cycleCountDetailChild);
 }
@@ -8,6 +8,9 @@ import org.jeecg.modules.wms.config.container.entity.Container;
 import org.jeecg.modules.wms.config.container.service.impl.ContainerServiceImpl;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.impl.LocationServiceImpl;
+import org.jeecg.modules.wms.config.material.entity.Material;
+import org.jeecg.modules.wms.config.material.service.impl.MaterialServiceImpl;
+import org.jeecg.modules.wms.config.materialType.entity.MaterialType;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetail;
@@ -57,6 +60,10 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
 	private LocationServiceImpl locationService;
 	@Resource
 	private TaskHeaderServiceImpl taskHeaderService;
+	@Autowired
+	private ICycleCountDetailService cycleCountDetailService;
+	@Resource
+	private MaterialServiceImpl materialServiceImpl;
 	@Resource
 	private TaskDetailServiceImpl taskDetailService;
 	@Resource
@@ -320,5 +327,29 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
 		return result;
 	}
  
+	@Override
+	public Result increaseInInventoryGain(CycleCountDetailChild cycleCountDetailChild) {
+		CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(cycleCountDetailChild.getCycleCountDetailid());
+		if (cycleCountDetail==null)
+		{
+			return Result.error("盘点明细不存在");
+		}
+
+		cycleCountDetailChild.setCyclecountheadcode(cycleCountDetail.getCycleCountHeadCode());
+		cycleCountDetailChild.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_REGISTERED);
+		cycleCountDetailChild.setLocationCode(cycleCountDetail.getLocationCode());
+		cycleCountDetailChild.setContainerCode(cycleCountDetail.getContainerCode());
+
+		Material materialByCode = materialServiceImpl.getMaterialByCode(cycleCountDetailChild.getMaterialCode());
+		cycleCountDetailChild.setMaterialName(materialByCode.getName());
+		cycleCountDetailChild.setMaterialSpec(materialByCode.getSpec());
+		cycleCountDetailChild.setMaterialUnit(materialByCode.getUnit());
+		cycleCountDetailChild.setSystemQty(BigDecimal.ZERO);
+		cycleCountDetailChild.setGapQty(BigDecimal.ZERO.subtract(cycleCountDetailChild.getCountedQty()));
+		cycleCountDetailChildServiceImpl.save(cycleCountDetailChild);
+
+		return Result.ok("成功");
+	}
+
  
 }