添加物料控制类

mahuandong
1 parent 77bfeaf7
Showing 8 changed files with 268 additions and 58 deletions
.gitignore
.idea/workspace.xml
src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java
src/main/java/com/huaheng/pc/general/material/domain/Material.java
src/main/java/com/huaheng/pc/general/material/service/MaterialService.java
src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java
src/main/resources/templates/general/location/add.html
src/main/resources/templates/general/location/location.html
@@ -10,6 +10,7 @@ target/
 *.iws
 *.iml
 *.ipr
+.idea/workspace.xml
  
 ### NetBeans ###
 /nbproject/private/
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="用户查询修改">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+    <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/domain/Material.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/domain/Material.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/add.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -54,14 +48,7 @@
         <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
         <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
         <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
-        <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
-      </path>
-      <path>
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
-        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
-        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
-        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
-        <item name="location_type: table" type="285a2a93:MysqlImplModel$Table" />
+        <item name="material: table" type="285a2a93:MysqlImplModel$Table" />
       </path>
     </expand>
     <select />
@@ -120,11 +107,14 @@
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565255020864" />
     <property name="database.console.LAST_STATE" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
     <property name="node.js.path.for.package.tslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="project.structure.last.edited" value="Project" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.0" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RecentsManager">
@@ -137,6 +127,11 @@
     </key>
   </component>
   <component name="RunDashboard">
+    <option name="configurationTypes">
+      <set>
+        <option value="SpringBootApplicationConfigurationType" />
+      </set>
+    </option>
     <option name="ruleStates">
       <list>
         <RuleState>
@@ -148,36 +143,36 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.HuaHengApplication">
-    <configuration name="CreateCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.huaheng.test.CreateCode" />
-      <module name="WMSV1" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.huaheng.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
+  <component name="RunManager">
+    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" activateToolWindowBeforeRun="false" singleton="false" nameIsGenerated="true">
+      <module name="huaheng" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
+      <option name="DEBUG_MODE" value="true" />
+      <option name="HIDE_BANNER" value="true" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="WMSV1" />
+    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" activateToolWindowBeforeRun="false">
+      <module name="huaheng" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
+      <option name="DEBUG_MODE" value="true" />
+      <option name="HIDE_BANNER" value="true" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.CreateCode" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="ServiceViewManager">
     <option name="allServicesViewState">
       <serviceView>
+        <option name="contentProportion" value="0.17955652" />
         <treeState>
           <expand />
           <select />
@@ -185,6 +180,7 @@
         <option name="groupByContributor" value="true" />
       </serviceView>
     </option>
+    <option name="selectedView" value="0" />
   </component>
   <component name="StructureViewFactory">
     <option name="ACTIVE_ACTIONS" value=",SHOW_PROPERTIES,SHOW_ANONYMOUS,SHOW_LAMBDA,SHOW_INTERFACES,VISIBILITY_SORTER" />
@@ -213,6 +209,9 @@
       <workItem from="1565244881255" duration="620000" />
       <workItem from="1565245587599" duration="32000" />
       <workItem from="1565245636976" duration="7465000" />
+      <workItem from="1565336358595" duration="3615000" />
+      <workItem from="1565339991037" duration="87000" />
+      <workItem from="1565340093097" duration="3717000" />
     </task>
     <task id="LOCAL-00001" summary="用户查询修改">
       <created>1565058322310</created>
@@ -277,7 +276,14 @@
       <option name="project" value="LOCAL" />
       <updated>1565335994460</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="git忽略">
+      <created>1565336618584</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1565336618584</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -323,12 +329,14 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
+    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="用户查询修改" />
     <MESSAGE value="库区设置编辑" />
     <MESSAGE value="zone修改" />
     <MESSAGE value="回退" />
     <MESSAGE value="修改表格分页获取总记录数" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改表格分页获取总记录数" />
+    <MESSAGE value="git忽略" />
+    <option name="LAST_COMMIT_MESSAGE" value="git忽略" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -339,9 +347,9 @@
           <option name="timeStamp" value="11" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java</url>
-          <line>56</line>
-          <option name="timeStamp" value="13" />
+          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java</url>
+          <line>21</line>
+          <option name="timeStamp" value="14" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
+package com.huaheng.pc.general.material.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.location.domain.Location;
+import com.huaheng.pc.general.location.service.LocationService;
+import com.huaheng.pc.general.material.domain.Material;
+import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags={"物料控制类"})
+@Controller
+@RequestMapping("/general/material")
+public class MaterialController extends BaseController {
+
+    private String prefix = "general/material";
+
+    private MaterialService materialService;
+
+    @RequiresPermissions("general:material:view")
+    @GetMapping()
+    public String material() {
+        return prefix + "/material";
+    }
+
+    /**
+     * 查询物料列表
+     */
+    @ApiOperation(value="查看物料列表",
+            notes="根据物料编码、名称、规格、物料类别、创建时间获取物料的详细信息",
+            httpMethod = "POST")
+    @RequiresPermissions("general:material:list")
+    @Log(title = "通用-物料管理", operating = "查看物料列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(
+            @ApiParam(name="location",value="物料编码、名称、规格、物料类别") Material material,
+            @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+            @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        LambdaQueryWrapper<Material> lambda = Wrappers.lambdaQuery();
+        lambda.gt(StringUtils.isNotEmpty(createdBegin), Material::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), Material::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(material.getCode()), Material::getCode, material.getCode())
+                .eq(StringUtils.isNotEmpty(material.getName()), Material::getName, material.getName())
+                .eq(StringUtils.isNotEmpty(material.getType()), Material::getType, material.getType())
+                .like(StringUtils.isNotEmpty(material.getSpec()), Material::getSpec, material.getSpec())
+                .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .in(Material::getCompanyCode, ShiroUtils.getCompanyCodeList())
+                .ne(Material::getDeleted, false);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<Material> page = new Page<>(pageNum, pageSize);
+            IPage<Material> iPage = materialService.page(page, lambda);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<Material> list = materialService.list(lambda);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增物料
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存物料
+     */
+    @ApiOperation(value="新增物料", notes="新增物料", httpMethod = "POST")
+    @RequiresPermissions("general:material:add")
+    @Log(title = "通用-物料管理", operating = "新增物料", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Material material) {
+
+        LambdaQueryWrapper<Material> lambda = Wrappers.lambdaQuery();
+        lambda.eq(Material::getCode, material.getCode())
+            .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode())
+            .eq(Material::getDeleted, false);
+        Map<String, Object> map = materialService.getMap(lambda);
+        if (map != null) {
+            return AjaxResult.error("物料已经存在");
+        }
+
+        material.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        material.setCreatedBy(ShiroUtils.getLoginName());
+        material.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return AjaxResult.toAjax(materialService.save(material));
+    }
+
+    /**
+     * 修改物料
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        Material material = materialService.getById(id);
+        mmap.put("material", material);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存物料
+     */
+    @ApiOperation(value="修改物料", notes="修改物料", httpMethod = "POST")
+    @RequiresPermissions("general:material:edit")
+    @Log(title = "通用-物料管理", operating = "修改物料", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Material material) {
+        material.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(materialService.updateById(material));
+    }
+
+    /**
+     * 删除物料
+     */
+    @RequiresPermissions("general:material:remove")
+    @Log(title = "通用-物料管理", operating = "删除物料", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        } else {
+            return materialService.removeByIds(ids);
+        }
+    }
+
+}
@@ -273,6 +273,11 @@ public class Material implements Serializable {
     @ApiModelProperty(value="自定义字段8")
     private String userDef8;
  
+    /* 删除标记*/
+    @TableField(value = "deleted")
+    @ApiModelProperty(value = "删除标记")
+    private Boolean deleted;
+
     private static final long serialVersionUID = 1L;
  
     public static final String COL_CODE = "code";
@@ -346,4 +351,6 @@ public class Material implements Serializable {
     public static final String COL_USERDEF7 = "userDef7";
  
     public static final String COL_USERDEF8 = "userDef8";
+
+    public static final String COL_DELETED = "deleted";
 }
 \ No newline at end of file
 package com.huaheng.pc.general.material.service;
  
+import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.general.material.domain.Material;
 import com.baomidou.mybatisplus.extension.service.IService;
 public interface MaterialService extends IService<Material>{
  
+    AjaxResult removeByIds(String ids);
  
 }
 package com.huaheng.pc.general.material.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
+import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.general.material.mapper.MaterialMapper;
 import com.huaheng.pc.general.material.domain.Material;
@@ -10,4 +19,31 @@ import com.huaheng.pc.general.material.service.MaterialService;
 @Service
 public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService{
  
+    @Resource
+    private ReceiptDetailService receiptDetailService;
+
+    @Override
+    public AjaxResult removeByIds(String ids) {
+        int count = 0;
+        for (Integer id : Convert.toIntArray(ids)) {
+            Material material = this.getById(id);
+
+            LambdaQueryWrapper<ReceiptDetail> lambda = Wrappers.lambdaQuery();
+            lambda.eq(ReceiptDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                  .eq(ReceiptDetail::getMaterialCode, material.getCode())
+                  .eq(ReceiptDetail::getDeleted, false)
+                .last("LIMIT 1");
+
+            Map<String, Object> map = receiptDetailService.getMap(lambda);
+            if (map != null) {
+                return AjaxResult.error("存货编码(" + material.getCode() +")存在入库单，不能删除！");
+            }
+            material.setDeleted(true);
+            material.setLastUpdatedBy(ShiroUtils.getLoginName());
+            if (this.updateById(material)){
+                count++;
+            }
+        }
+        return AjaxResult.success("成功删除"+count+"条记录");
+    }
 }
@@ -46,15 +46,11 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">是否有效：</label>
+				<label class="col-sm-3 control-label">库位状态：</label>
 				<div class="col-sm-8">
-                    <div class="onoffswitch">
-                        <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
-                        <label class="onoffswitch-label" for="enable">
-                            <span class="onoffswitch-inner"></span>
-                            <span class="onoffswitch-switch"></span>
-                        </label>
-                    </div>
+					<select id="status" name="status" class="form-control" th:with="statusList=${@dict.getType('locationStatus')}">
+						<option th:each="item : ${statusList}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}"></option>
+					</select>
 				</div>
 			</div>
 			<div class="form-group">
@@ -86,7 +86,7 @@
         var editFlag = [[${@permission.hasPermi('general:location:edit')}]];
         var removeFlag = [[${@permission.hasPermi('general:location:remove')}]];
         var datas = [[${@dict.getType('sys_normal_disable')}]];
-        var locationTypes = [[${@locationType.getLocationPrefix()}]];
+        var locationTypes = [[${@dict.getType('locationType')}]];
         var locationStatus = [[${@dict.getType('locationStatus')}]];
  
         $(function() {
@@ -134,14 +134,14 @@
 				{
 					field : 'name',
 					title : '名称',
-					visible : 'false'
+					visible : false
 				},
 				{
 					field : 'locationType',
 					title : '库位类型' ,
                     align: 'center',
                     formatter: function(value, row, index) {
-                        return $.table.selectPrefixToName(locationTypes, value);
+                        return $.table.selectDictLabel(locationTypes, value);
                     }
 				},
 				{
@@ -156,7 +156,7 @@
 				{
 					field : 'zoneId', 
 					title : '库区Id' ,
-					visible:false
+					visible : false
 				},
 				{
 					field : 'zoneCode',