领料单（原料/辅料/半成品）、上线支持日志（48、49、55、56、73）

1 year ago · d666034ab5
58 changed files with 1170 additions and 581 deletions
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/ruoyi-activiti/ruoyi-activiti.iml" filepath="$PROJECT_DIR$/ruoyi-activiti/ruoyi-activiti.iml" />
-      <module fileurl="file://$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" filepath="$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common.iml" filepath="$PROJECT_DIR$/ruoyi-common/ruoyi-common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" filepath="$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" />
-      <module fileurl="file://$PROJECT_DIR$/ruoyi-generator/ruoyi-generator.iml" filepath="$PROJECT_DIR$/ruoyi-generator/ruoyi-generator.iml" />
-      <module fileurl="file://$PROJECT_DIR$/ruoyi-quartz/ruoyi-quartz.iml" filepath="$PROJECT_DIR$/ruoyi-quartz/ruoyi-quartz.iml" />
-      <module fileurl="file://$PROJECT_DIR$/ruoyi-system/ruoyi-system.iml" filepath="$PROJECT_DIR$/ruoyi-system/ruoyi-system.iml" />
-    </modules>
-  </component>
-</project>
--- a/log.path_IS_UNDEFINED/sys-user.log
+++ b/log.path_IS_UNDEFINED/sys-user.log
@ -1,46 +1,22 @@
-09:19:58.017 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-09:25:47.462 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-09:25:47.463 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:25:47.464 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:26:22.401 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-09:30:35.910 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-09:30:35.914 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:30:35.915 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:31:04.832 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-09:32:20.576 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-09:32:20.578 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:32:20.578 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:32:53.897 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-09:36:30.407 [Thread-38] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-09:36:30.408 [Thread-38] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:36:30.408 [Thread-38] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:37:07.832 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:37:07.833 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:37:56.116 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-09:39:00.885 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-09:39:00.885 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:39:00.885 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:39:26.053 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-09:40:14.231 [Thread-39] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-09:40:14.232 [Thread-39] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:40:14.232 [Thread-39] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:40:43.714 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:40:43.716 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:41:05.565 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-09:50:15.147 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-09:50:15.148 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:50:15.148 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-09:54:32.967 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-09:57:39.429 [Thread-39] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-09:57:39.430 [Thread-39] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-09:57:39.431 [Thread-39] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-10:07:34.344 [Thread-51] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-10:07:34.345 [Thread-51] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-10:08:07.258 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-11:41:15.736 [Thread-64] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-11:41:15.739 [Thread-64] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-11:41:15.739 [Thread-64] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-11:41:36.567 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-11:56:17.833 [Thread-77] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-11:56:17.835 [Thread-77] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-11:56:17.836 [Thread-77] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
+09:39:43.067 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
+10:01:53.777 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
+10:01:53.780 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
+10:01:53.780 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
+11:41:49.331 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
+11:58:51.676 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
+11:58:51.680 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
+11:58:51.680 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
+16:36:34.899 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
+17:44:35.961 [Thread-45] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
+17:44:35.966 [Thread-45] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
+17:44:35.966 [Thread-45] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
+17:48:03.701 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
+17:48:03.704 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
+17:48:45.982 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
+17:54:08.578 [Thread-44] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
+17:54:08.582 [Thread-44] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
+17:54:08.582 [Thread-44] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
+17:54:48.587 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
+18:05:12.083 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
+18:05:12.085 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
+18:05:12.085 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
--- a/ruoyi-activiti/ruoyi-activiti.iml
+++ b/ruoyi-activiti/ruoyi-activiti.iml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <datasource-mapping>
-          <factory-entry name="ruoyi-activiti" />
-        </datasource-mapping>
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>
--- a/ruoyi-admin/ruoyi-admin.iml
+++ b/ruoyi-admin/ruoyi-admin.iml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <datasource-mapping>
-          <factory-entry name="ruoyi-admin" />
-        </datasource-mapping>
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.java
@ -7,12 +7,11 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.metadata.style.WriteFont;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.ruoyi.ck.utils.Result;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,8 +22,8 @@ import com.ruoyi.manufacture.domain.exportDto.MaterialRequisitionInfoDto;
 import com.ruoyi.manufacture.service.IMaterialRequisitionDetailService;
 import com.ruoyi.manufacture.service.IMaterialRequisitionInfoService;
 import com.ruoyi.system.service.ISysDictTypeService;
-import com.ruoyi.system.utils.CellStyleStrategy;
 import com.ruoyi.system.utils.ExcelFillCellMergePrevColUtils;
+import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -55,6 +54,9 @@ import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.
 public class MaterialRequisitionInfoController extends BaseController
 {
    private String prefix = "manufacture/materialRequisitionInfo";
+    private String prefixRaw = "manufacture/materialRequisitionYL";
+    private String prefixSubsidiary = "manufacture/materialRequisitionFL";
+    private String prefixBcp = "manufacture/materialRequisitionBCP";

    @Autowired
    private IMaterialRequisitionInfoService materialRequisitionInfoService;
@ -63,23 +65,72 @@ public class MaterialRequisitionInfoController extends BaseController
    @Autowired
    private ISysDictTypeService sysDictTypeService;

-    @RequiresPermissions("manufacture:materialRequisitionInfo:view")
-    @GetMapping()
-    public String materialRequisitionInfo()
+//    @RequiresPermissions("manufacture:materialRequisitionInfo:view")
+//    @GetMapping()
+//    public String materialRequisitionInfo()
+//    {
+//        return prefix + "/materialRequisitionInfo";
+//    }
+
+    @RequiresPermissions("manufacture:materialRequisitionInfo:viewRaw")
+    @GetMapping("/viewRaw")
+    public String materialRequisitionRaw()
+    {
+        return prefixRaw + "/materialRequisitionYL";
+    }
+
+    @RequiresPermissions("manufacture:materialRequisitionInfo:viewSubsidiary")
+    @GetMapping("/viewSubsidiary")
+    public String materialRequisitionSubsidiary()
+    {
+        return prefixSubsidiary + "/materialRequisitionFL";
+    }
+
+    @RequiresPermissions("manufacture:materialRequisitionInfo:viewBcp")
+    @GetMapping("/viewBcp")
+    public String materialRequisitionBcp()
    {
-        return prefix + "/materialRequisitionInfo";
+        return prefixBcp + "/materialRequisitionBCP";
    }

    /**
     * 查询领料单列表
     */
-    @RequiresPermissions("manufacture:materialRequisitionInfo:list")
-    @PostMapping("/list")
+//    @RequiresPermissions("manufacture:materialRequisitionInfo:list")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public TableDataInfo list(MaterialRequisitionInfo materialRequisitionInfo)
+//    {
+//        startPage();
+//        List<MaterialRequisitionInfo> list = materialRequisitionInfoService.selectMaterialRequisitionInfoList(materialRequisitionInfo);
+//        return getDataTable(list);
+//    }
+
+    @RequiresPermissions("manufacture:materialRequisitionInfo:listRaw")
+    @PostMapping("/listRaw")
    @ResponseBody
-    public TableDataInfo list(MaterialRequisitionInfo materialRequisitionInfo)
+    public TableDataInfo listRaw(MaterialRequisitionInfo materialRequisitionInfo)
    {
        startPage();
-        List<MaterialRequisitionInfo> list = materialRequisitionInfoService.selectMaterialRequisitionInfoList(materialRequisitionInfo);
+        List<MaterialRequisitionInfo> list = materialRequisitionInfoService.selectMaterialRequisitionInfoListRaw(materialRequisitionInfo);
+        return getDataTable(list);
+    }
+    @RequiresPermissions("manufacture:materialRequisitionInfo:listSubsidiary")
+    @PostMapping("/listSubsidiary")
+    @ResponseBody
+    public TableDataInfo listSubsidiary(MaterialRequisitionInfo materialRequisitionInfo)
+    {
+        startPage();
+        List<MaterialRequisitionInfo> list = materialRequisitionInfoService.selectMaterialRequisitionInfoListSubsidiary(materialRequisitionInfo);
+        return getDataTable(list);
+    }
+    @RequiresPermissions("manufacture:materialRequisitionInfo:listBcp")
+    @PostMapping("/listBcp")
+    @ResponseBody
+    public TableDataInfo listBcp(MaterialRequisitionInfo materialRequisitionInfo)
+    {
+        startPage();
+        List<MaterialRequisitionInfo> list = materialRequisitionInfoService.selectMaterialRequisitionInfoListBcp(materialRequisitionInfo);
        return getDataTable(list);
    }

@ -106,6 +157,24 @@ public class MaterialRequisitionInfoController extends BaseController
        return prefix + "/add";
    }

+    @GetMapping("/addRaw")
+    public String addRaw()
+    {
+        return prefixRaw + "/add";
+    }
+
+    @GetMapping("/addSubsidiary")
+    public String addSubsidiary()
+    {
+        return prefixSubsidiary + "/add";
+    }
+
+    @GetMapping("/addBcp")
+    public String addBcp()
+    {
+        return prefixBcp + "/add";
+    }
+
    /**
     * 新增保存领料单
     */
@ -121,14 +190,35 @@ public class MaterialRequisitionInfoController extends BaseController
    /**
     * 修改领料单
     */
-    @GetMapping("/edit/{materialRequisitionId}")
-    public String edit(@PathVariable("materialRequisitionId") Long materialRequisitionId, ModelMap mmap)
+//    @GetMapping("/edit/{materialRequisitionId}")
+//    public String edit(@PathVariable("materialRequisitionId") Long materialRequisitionId, ModelMap mmap)
+//    {
+//        MaterialRequisitionInfo materialRequisitionInfo = materialRequisitionInfoService.selectMaterialRequisitionInfoById(materialRequisitionId);
+//        mmap.put("materialRequisitionInfo", materialRequisitionInfo);
+//        return prefix + "/edit";
+//    }
+
+    @GetMapping("/editRaw/{materialRequisitionId}")
+    public String editRaw(@PathVariable("materialRequisitionId") Long materialRequisitionId, ModelMap mmap)
    {
        MaterialRequisitionInfo materialRequisitionInfo = materialRequisitionInfoService.selectMaterialRequisitionInfoById(materialRequisitionId);
        mmap.put("materialRequisitionInfo", materialRequisitionInfo);
-        return prefix + "/edit";
+        return prefixRaw + "/edit";
+    }
+    @GetMapping("/editSubsidiary/{materialRequisitionId}")
+    public String editSubsidiary(@PathVariable("materialRequisitionId") Long materialRequisitionId, ModelMap mmap)
+    {
+        MaterialRequisitionInfo materialRequisitionInfo = materialRequisitionInfoService.selectMaterialRequisitionInfoById(materialRequisitionId);
+        mmap.put("materialRequisitionInfo", materialRequisitionInfo);
+        return prefixSubsidiary + "/edit";
+    }
+    @GetMapping("/editBcp/{materialRequisitionId}")
+    public String editBcp(@PathVariable("materialRequisitionId") Long materialRequisitionId, ModelMap mmap)
+    {
+        MaterialRequisitionInfo materialRequisitionInfo = materialRequisitionInfoService.selectMaterialRequisitionInfoById(materialRequisitionId);
+        mmap.put("materialRequisitionInfo", materialRequisitionInfo);
+        return prefixBcp + "/edit";
    }
-
    /**
     * 修改保存领料单
     */
@ -155,23 +245,23 @@ public class MaterialRequisitionInfoController extends BaseController

    @RequiresPermissions("manufacture:materialRequisitionInfo:remove")
    @Log(title = "领料单", businessType = BusinessType.DELETE)
-    @RequestMapping( "/removeSelectedOrder")
+    @RequestMapping( "/removeSelected")
    @ResponseBody
-    public String removeSelectedOrder(@RequestParam(value = "orderData") String orderData) {
-//        System.out.println(orderData);
-        List<MaterialRequisitionInfo> materialRequisitionInfoList= JSONObject.parseArray(orderData, MaterialRequisitionInfo.class);
-
-        MaterialRequisitionInfo materialRequisitionInfo = materialRequisitionInfoService.selectMaterialRequisitionInfoById(materialRequisitionInfoList.get(0).getMaterialRequisitionId());
-        System.out.println(materialRequisitionInfo);
-        MaterialRequisitionDetail materialRequisitionDetail = new MaterialRequisitionDetail();
-        materialRequisitionDetail.setMaterialRequisitionNumber(materialRequisitionInfo.getMaterialRequisitionNumber());
-        List<MaterialRequisitionDetail> MaterialRequisitionDetail1 = materialRequisitionDetailService.selectMaterialRequisitionDetailList(materialRequisitionDetail);
-        if (MaterialRequisitionDetail1.size()>0) {
-            for (int i=0;i<MaterialRequisitionDetail1.size();i++) {
-                materialRequisitionDetailService.deleteMaterialRequisitionDetailById(MaterialRequisitionDetail1.get(i).getMaterialRequisitionDetailId());
+    public String removeSelected(@RequestParam(value = "ids") String ids) {
+        System.out.println(ids);
+        String[] idsStr = ids.split(",");
+        for (int i = 0; i< idsStr.length; i++) {
+            MaterialRequisitionInfo materialRequisitionInfo = materialRequisitionInfoService.selectMaterialRequisitionInfoById(Long.valueOf(idsStr[i]));
+            MaterialRequisitionDetail materialRequisitionDetail = new MaterialRequisitionDetail();
+            materialRequisitionDetail.setMaterialRequisitionNumber(materialRequisitionInfo.getMaterialRequisitionNumber());
+            List<MaterialRequisitionDetail> list = materialRequisitionDetailService.selectMaterialRequisitionDetailList(materialRequisitionDetail);
+            if (list.size()>0) {
+                for (int j=0;j<list.size();j++) {
+                    materialRequisitionDetailService.deleteMaterialRequisitionDetailById(list.get(j).getMaterialRequisitionDetailId());
+                }
            }
        }
-        materialRequisitionInfoService.deleteMaterialRequisitionInfoById(materialRequisitionInfoList.get(0).getMaterialRequisitionId());
+        materialRequisitionInfoService.deleteMaterialRequisitionInfoByIds(ids);
        return "操作成功！";
    }

@ -182,6 +272,27 @@ public class MaterialRequisitionInfoController extends BaseController
        return Result.getSuccessResult(materialRequisitionInfoService.getId());
    }

+    /**
+     * 获取订单id
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/getRawId")
+    @ResponseBody
+    public Result getRawId() throws Exception {
+        return Result.getSuccessResult(materialRequisitionInfoService.getRawId());
+    }
+    @PostMapping("/getSubsidiaryId")
+    @ResponseBody
+    public Result getSubsidiaryId() throws Exception {
+        return Result.getSuccessResult(materialRequisitionInfoService.getSubsidiaryId());
+    }
+    @PostMapping("/getBcpId")
+    @ResponseBody
+    public Result getBcpId() throws Exception {
+        return Result.getSuccessResult(materialRequisitionInfoService.getBcpId());
+    }
+
    /**
     * 导出领料单列表
     */
@ -244,13 +355,15 @@ public class MaterialRequisitionInfoController extends BaseController
            map.put("workOrderNumber", materialRequisitionInfoDto.getWorkOrderNumber());
            map.put("firstAddTime", materialRequisitionInfoDto.getFirstAddTime());
            map.put("outputDate", materialRequisitionInfoDto.getOutputDate());
-            List<SysDictData> deptData = sysDictTypeService.selectDictDataByType("sys_dept_type");
-            for (int i = 0;i<deptData.size();i++) {
-                if (materialRequisitionInfoDto.getDeptName().equals(deptData.get(i).getDictValue())) {
-                    map.put("deptName", deptData.get(i).getDictLabel());
-                }
-            }
+//            List<SysDictData> deptData = sysDictTypeService.selectDictDataByType("sys_dept_type");
+//            for (int i = 0;i<deptData.size();i++) {
+//                if (materialRequisitionInfoDto.getDeptName().equals(deptData.get(i).getDictValue())) {
+//                    map.put("deptName", deptData.get(i).getDictLabel());
+//                }
+//            }
 //            map.put("deptName", materialRequisitionInfoDto.getDeptName());
+
+            map.put("deptName", materialRequisitionInfoDto.getDeptName());
            map.put("finishProductCode", materialRequisitionInfoDto.getFinishProductCode());
            map.put("typeMachine", materialRequisitionInfoDto.getTypeMachine());
            map.put("workOrderQuantity", materialRequisitionInfoDto.getWorkOrderQuantity());
@ -259,7 +372,8 @@ public class MaterialRequisitionInfoController extends BaseController
        }
    }

-    public CellStyleStrategy horizontalCellStyleStrategyBuilder() {
+
+    public HorizontalCellStyleStrategy horizontalCellStyleStrategyBuilder() {
        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
        //设置头字体
        WriteFont headWriteFont = new WriteFont();
@ -268,14 +382,20 @@ public class MaterialRequisitionInfoController extends BaseController
        headWriteCellStyle.setWriteFont(headWriteFont);
        //设置头居中
        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+
        //内容策略
        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
        //设置 水平居中
        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
        //垂直居中
        contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        //单元格边框
+        contentWriteCellStyle.setBorderTop(BorderStyle.DASHED);
+        contentWriteCellStyle.setBorderLeft(BorderStyle.DASHED);
+        contentWriteCellStyle.setBorderRight(BorderStyle.DASHED);
+        contentWriteCellStyle.setBorderRight(BorderStyle.DASHED);

-        return new CellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+        return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
    }

 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/MaterialRequisitionInfoMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/MaterialRequisitionInfoMapper.java
@ -27,6 +27,9 @@ public interface MaterialRequisitionInfoMapper
     * @return 领料单集合
     */
    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoList(MaterialRequisitionInfo materialRequisitionInfo);
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListRaw(MaterialRequisitionInfo materialRequisitionInfo);
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListSubsidiary(MaterialRequisitionInfo materialRequisitionInfo);
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListBcp(MaterialRequisitionInfo materialRequisitionInfo);

    /**
     * 新增领料单
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.java
@ -28,6 +28,30 @@ public interface IMaterialRequisitionInfoService
     */
    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoList(MaterialRequisitionInfo materialRequisitionInfo);

+    /**
+     * 查询原料领料单列表
+     *
+     * @param materialRequisitionInfo 原料领料单
+     * @return 原料领料单集合
+     */
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListRaw(MaterialRequisitionInfo materialRequisitionInfo);
+
+    /**
+     * 查询辅料领料单列表
+     *
+     * @param materialRequisitionInfo 辅料领料单
+     * @return 辅料领料单集合
+     */
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListSubsidiary(MaterialRequisitionInfo materialRequisitionInfo);
+
+    /**
+     * 查询半成品领料单列表
+     *
+     * @param materialRequisitionInfo 半成品领料单
+     * @return 半成品领料单集合
+     */
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListBcp(MaterialRequisitionInfo materialRequisitionInfo);
+
    /**
     * 新增领料单
     * 
@ -60,5 +84,27 @@ public interface IMaterialRequisitionInfoService
     */
    public int deleteMaterialRequisitionInfoById(Long materialRequisitionId);

+    /**
+     * 获取领料单号
+     * @return
+     */
    public String getId();
+
+    /**
+     * 获取原料领料单号
+     * @return
+     */
+    public String getRawId();
+
+    /**
+     * 获取辅料领料单号
+     * @return
+     */
+    public String getSubsidiaryId();
+
+    /**
+     * 获取半成品领料单号
+     * @return
+     */
+    public String getBcpId();
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.java
@ -45,6 +45,21 @@ public class MaterialRequisitionInfoServiceImpl implements IMaterialRequisitionI
    {
        return materialRequisitionInfoMapper.selectMaterialRequisitionInfoList(materialRequisitionInfo);
    }
+    @Override
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListRaw(MaterialRequisitionInfo materialRequisitionInfo)
+    {
+        return materialRequisitionInfoMapper.selectMaterialRequisitionInfoListRaw(materialRequisitionInfo);
+    }
+    @Override
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListSubsidiary(MaterialRequisitionInfo materialRequisitionInfo)
+    {
+        return materialRequisitionInfoMapper.selectMaterialRequisitionInfoListSubsidiary(materialRequisitionInfo);
+    }
+    @Override
+    public List<MaterialRequisitionInfo> selectMaterialRequisitionInfoListBcp(MaterialRequisitionInfo materialRequisitionInfo)
+    {
+        return materialRequisitionInfoMapper.selectMaterialRequisitionInfoListBcp(materialRequisitionInfo);
+    }

    /**
     * 新增领料单
@ -99,4 +114,19 @@ public class MaterialRequisitionInfoServiceImpl implements IMaterialRequisitionI
        String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
        return "WLLL" + time;
    }
+    @Override
+    public String getRawId() {
+        String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
+        return "YLLL" + time;
+    }
+    @Override
+    public String getSubsidiaryId() {
+        String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
+        return "FLLL" + time;
+    }
+    @Override
+    public String getBcpId() {
+        String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
+        return "CPLL" + time;
+    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java
@ -113,9 +113,7 @@ public class WarehousingInInfoController extends BaseController
        return prefixPDFinishProduct + "/warehousingInPDFinishProduct";
    }

-    /**
-     * 查询入库列表
-     */
+
 //    @RequiresPermissions("storehouse:warehousingInInfo:list")
 //    @PostMapping("/list")
 //    @ResponseBody
@ -125,6 +123,10 @@ public class WarehousingInInfoController extends BaseController
 //        List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInInfoList(warehousingInInfo);
 //        return getDataTable(list);
 //    }
+
+    /**
+     * 查询入库列表
+     */
    @RequiresPermissions("storehouse:warehousingInInfo:listRaw")
    @PostMapping("/listRaw")
    @ResponseBody
--- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingStagnantMaterialController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingStagnantMaterialController.java
@ -57,6 +57,12 @@ public class WarehousingStagnantMaterialController extends BaseController
        List<WarehousingStagnantMaterial> list = warehousingStagnantMaterialService.selectStagnantMaterialOutList(warehousingStagnantMaterial);
        return getDataTable(list);
    }
+
+    @PostMapping("/getAllCount")
+    @ResponseBody
+    public Integer getAllCount() {
+        return null;
+    }
 //
 //    /**
 //     * 导出呆滞物料列表
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBom.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBom.java
@ -69,6 +69,9 @@ public class SysBom extends BaseEntity
    /** 规格型号 */
    @Excel(name = "规格型号")
    private String specificationModel;
+    /** 机种 */
+    @Excel(name = "机种")
+    private String typeMachine;

    /** 单位 */
    @Excel(name = "单位")
@ -227,7 +230,16 @@ public class SysBom extends BaseEntity
    {
        return specificationModel;
    }
-    public void setInventoryUnit(String inventoryUnit) 
+
+    public String getTypeMachine() {
+        return typeMachine;
+    }
+
+    public void setTypeMachine(String typeMachine) {
+        this.typeMachine = typeMachine;
+    }
+
+    public void setInventoryUnit(String inventoryUnit)
    {
        this.inventoryUnit = inventoryUnit;
    }
@ -304,6 +316,7 @@ public class SysBom extends BaseEntity
            .append("finishProductCode", getFinishProductCode())
            .append("finishProductName", getFinishProductName())
            .append("specificationModel", getSpecificationModel())
+            .append("typeMachine", getTypeMachine())
            .append("inventoryUnit", getInventoryUnit())
            .append("currentVersion", getCurrentVersion())
            .append("confirmNo", getConfirmNo())
--- a/ruoyi-admin/src/main/resources/mapper/manufacture/MaterialRequisitionInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/manufacture/MaterialRequisitionInfoMapper.xml
@ -45,7 +45,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="getMaterialFlag != null  and getMaterialFlag != ''"> and get_material_flag = #{getMaterialFlag}</if>
        </where>
    </select>
-    
+    <select id="selectMaterialRequisitionInfoListRaw" parameterType="MaterialRequisitionInfo" resultMap="MaterialRequisitionInfoResult">
+        <include refid="selectMaterialRequisitionInfoVo"/>
+        <where>
+            material_requisition_number like '%YLLL%'
+            <if test="materialRequisitionNumber != null  and materialRequisitionNumber != ''"> and material_requisition_number like concat('%', #{materialRequisitionNumber}, '%')</if>
+            <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
+            <if test="workOrderNumber != null  and workOrderNumber != ''"> and work_order_number like concat('%', #{workOrderNumber}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name = #{deptName}</if>
+            <if test="stockName != null  and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
+            <if test="outputClass != null  and outputClass != ''"> and output_class = #{outputClass}</if>
+            <if test="params.beginOutputDate != null and params.beginOutputDate != '' and params.endOutputDate != null and params.endOutputDate != ''"> and output_date between #{params.beginOutputDate} and #{params.endOutputDate}</if>
+            <if test="getMaterialFlag != null  and getMaterialFlag != ''"> and get_material_flag = #{getMaterialFlag}</if>
+        </where>
+    </select>
+    <select id="selectMaterialRequisitionInfoListSubsidiary" parameterType="MaterialRequisitionInfo" resultMap="MaterialRequisitionInfoResult">
+        <include refid="selectMaterialRequisitionInfoVo"/>
+        <where>
+            material_requisition_number like '%FLLL%'
+            <if test="materialRequisitionNumber != null  and materialRequisitionNumber != ''"> and material_requisition_number like concat('%', #{materialRequisitionNumber}, '%')</if>
+            <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
+            <if test="workOrderNumber != null  and workOrderNumber != ''"> and work_order_number like concat('%', #{workOrderNumber}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name = #{deptName}</if>
+            <if test="stockName != null  and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
+            <if test="outputClass != null  and outputClass != ''"> and output_class = #{outputClass}</if>
+            <if test="params.beginOutputDate != null and params.beginOutputDate != '' and params.endOutputDate != null and params.endOutputDate != ''"> and output_date between #{params.beginOutputDate} and #{params.endOutputDate}</if>
+            <if test="getMaterialFlag != null  and getMaterialFlag != ''"> and get_material_flag = #{getMaterialFlag}</if>
+        </where>
+    </select>
+    <select id="selectMaterialRequisitionInfoListBcp" parameterType="MaterialRequisitionInfo" resultMap="MaterialRequisitionInfoResult">
+        <include refid="selectMaterialRequisitionInfoVo"/>
+        <where>
+            material_requisition_number like '%CPLL%'
+            <if test="materialRequisitionNumber != null  and materialRequisitionNumber != ''"> and material_requisition_number like concat('%', #{materialRequisitionNumber}, '%')</if>
+            <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
+            <if test="workOrderNumber != null  and workOrderNumber != ''"> and work_order_number like concat('%', #{workOrderNumber}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name = #{deptName}</if>
+            <if test="stockName != null  and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
+            <if test="outputClass != null  and outputClass != ''"> and output_class = #{outputClass}</if>
+            <if test="params.beginOutputDate != null and params.beginOutputDate != '' and params.endOutputDate != null and params.endOutputDate != ''"> and output_date between #{params.beginOutputDate} and #{params.endOutputDate}</if>
+            <if test="getMaterialFlag != null  and getMaterialFlag != ''"> and get_material_flag = #{getMaterialFlag}</if>
+        </where>
+    </select>
+
    <select id="selectMaterialRequisitionInfoById" parameterType="Long" resultMap="MaterialRequisitionInfoResult">
        <include refid="selectMaterialRequisitionInfoVo"/>
        where material_requisition_id = #{materialRequisitionId}
--- a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingStagnantMaterialMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingStagnantMaterialMapper.xml
@ -21,44 +21,236 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--        select date, stock_number, stock_name, material_code, material_name, material_type, specification_model, type_machine, inventory_unit, inventory_quantity from warehousing_stagnant_material-->
 <!--    </sql>-->
    <sql id="selectStagnantMaterialInVo">
-        SELECT
-            max(wii.warehousing_date) AS `date`,
-            wii.stock_number,
-            wii.stock_name,
-            wid.material_code,
-            wid.material_name,
-            wid.specification_model,
-            wid.type_machine,
-            wid.inventory_unit,
-            wid.material_type
-        FROM
-            warehousing_in_info wii,
-            warehousing_in_detail wid
-        WHERE
-            wii.warehousing_number = wid.warehousing_number
-        GROUP by material_code
-        having DATEDIFF(now(),MAX(wii.warehousing_date))>30
-
+--         SELECT
+--             max(wii.warehousing_date) AS `date`,
+--             wii.stock_number,
+--             wii.stock_name,
+--             wid.material_code,
+--             wid.material_name,
+--             wid.specification_model,
+--             wid.type_machine,
+--             wid.inventory_unit,
+--             wid.material_type
+--         FROM
+--             warehousing_in_info wii,
+--             warehousing_in_detail wid
+--         WHERE
+--             wii.warehousing_number = wid.warehousing_number
+--         GROUP by material_code
+--         having DATEDIFF(now(),MAX(wii.warehousing_date))>30
+            SELECT
+                `date`,
+                aaa.stock_number,
+                aaa.stock_name,
+                aaa.material_code,
+                aaa.material_name,
+                aaa.specification_model,
+                aaa.type_machine,
+                aaa.inventory_unit,
+                aaa.material_type,
+                bbb.stock_quantity AS inventory_quantity
+            FROM
+                (
+                    SELECT
+                        max( wii.warehousing_date ) AS `date`,
+                        wii.stock_number,
+                        wii.stock_name,
+                        wid.material_code,
+                        wid.material_name,
+                        wid.specification_model,
+                        wid.type_machine,
+                        wid.inventory_unit,
+                        wid.material_type
+                    FROM
+                        warehousing_in_info wii,
+                        warehousing_in_detail wid
+                    WHERE
+                        wii.warehousing_number = wid.warehousing_number
+                    GROUP BY
+                        material_code
+                    HAVING
+                            DATEDIFF(
+                                    now(),
+                                    MAX( wii.warehousing_date ))> 30
+                ) AS `aaa`,
+                (
+                    SELECT
+                        material_code,
+                        material_name,
+                        material_type,
+                        batch_number,
+                        specification_model,
+                        type_machine,
+                        inventory_unit,
+                        sum( count ) AS stock_quantity,
+                        stock_number,
+                        stock_name,
+                        enterprise_code,
+                        enterprise_name,
+                        storage_location
+                    FROM
+                        (
+                            SELECT
+                                warehousing_in_detail.material_code AS material_code,
+                                warehousing_in_detail.material_name AS material_name,
+                                warehousing_in_detail.material_type AS material_type,
+                                warehousing_in_detail.batch_number AS batch_number,
+                                warehousing_in_detail.specification_model AS specification_model,
+                                warehousing_in_detail.type_machine AS type_machine,
+                                warehousing_in_detail.inventory_unit AS inventory_unit,
+                                SUM( warehousing_in_detail.warehousing_quantity ) AS `count`,
+                                warehousing_in_info.stock_number AS stock_number,
+                                warehousing_in_info.stock_name AS stock_name,
+                                warehousing_in_info.enterprise_code AS enterprise_code,
+                                warehousing_in_info.enterprise_name AS enterprise_name,
+                                warehousing_in_detail.storage_location AS storage_location
+                            FROM
+                                warehousing_in_detail,
+                                warehousing_in_info
+                            WHERE
+                                    warehousing_in_detail.warehousing_number = warehousing_in_info.warehousing_number
+                            GROUP BY
+                                warehousing_in_detail.material_code UNION ALL
+                            SELECT
+                                outbound_detail.material_code AS material_code,
+                                outbound_detail.material_name AS material_name,
+                                outbound_info.material_type AS material_type,
+                                outbound_detail.batch_number AS batch_number,
+                                outbound_detail.specification_model AS specification_model,
+                                outbound_detail.type_machine AS type_machine,
+                                outbound_detail.inventory_unit AS inventory_unit,
+                                - SUM( outbound_detail.actual_count ) AS `count`,
+                                outbound_info.stock_no AS stock_number,
+                                outbound_info.stock_name AS stock_name,
+                                outbound_info.enterprise_code AS enterprise_code,
+                                outbound_info.enterprise_name AS enterprise_name,
+                                outbound_detail.storage_location AS storage_location
+                            FROM
+                                outbound_detail,
+                                outbound_info
+                            WHERE
+                                outbound_detail.outbound_no = outbound_info.outbound_no
+                            GROUP BY
+                                outbound_detail.material_code
+                        ) AS tabletemp
+                    GROUP BY
+                        material_code
+                ) AS `bbb`
+            WHERE aaa.material_code = bbb.material_code
    </sql>
    <sql id="selectStagnantMaterialOutVo">
+--         SELECT
+--             SUBSTRING(oi.outbound_date,1,10) AS `date`,
+--             oi.stock_no AS stock_number,
+--             oi.stock_name,
+--             od.material_code,
+--             od.material_name,
+--             od.specification_model,
+--             od.type_machine,
+--             od.inventory_unit,
+--             oi.material_type
+--         FROM
+--             outbound_info oi,
+--             outbound_detail od
+--         WHERE
+--             oi.outbound_no = od.outbound_no
+--         GROUP by material_code
+--         having DATEDIFF(now(),MAX(SUBSTRING(oi.outbound_date,1,10)))>30
        SELECT
-            SUBSTRING(oi.outbound_date,1,10) AS `date`,
-            oi.stock_no AS stock_number,
-            oi.stock_name,
-            od.material_code,
-            od.material_name,
-            od.specification_model,
-            od.type_machine,
-            od.inventory_unit,
-            oi.material_type
+            `date`,
+            ccc.stock_number,
+            ccc.stock_name,
+            ccc.material_code,
+            ccc.material_name,
+            ccc.specification_model,
+            ccc.type_machine,
+            ccc.inventory_unit,
+            ccc.material_type,
+            bbb.stock_quantity AS inventory_quantity
        FROM
-            outbound_info oi,
-            outbound_detail od
-        WHERE
-            oi.outbound_no = od.outbound_no
-        GROUP by material_code
-        having DATEDIFF(now(),MAX(SUBSTRING(oi.outbound_date,1,10)))>30
-
+            (
+                SELECT
+                    SUBSTRING(oi.outbound_date,1,10) AS `date`,
+                    oi.stock_no AS stock_number,
+                    oi.stock_name,
+                    od.material_code,
+                    od.material_name,
+                    od.specification_model,
+                    od.type_machine,
+                    od.inventory_unit,
+                    oi.material_type
+                FROM
+                    outbound_info oi,
+                    outbound_detail od
+                WHERE
+                    oi.outbound_no = od.outbound_no
+                GROUP by material_code
+                having DATEDIFF(now(),MAX(SUBSTRING(oi.outbound_date,1,10)))>30
+            ) AS `ccc`,
+            (
+                SELECT
+                    material_code,
+                    material_name,
+                    material_type,
+                    batch_number,
+                    specification_model,
+                    type_machine,
+                    inventory_unit,
+                    sum( count ) AS stock_quantity,
+                    stock_number,
+                    stock_name,
+                    enterprise_code,
+                    enterprise_name,
+                    storage_location
+                FROM
+                    (
+                        SELECT
+                            warehousing_in_detail.material_code AS material_code,
+                            warehousing_in_detail.material_name AS material_name,
+                            warehousing_in_detail.material_type AS material_type,
+                            warehousing_in_detail.batch_number AS batch_number,
+                            warehousing_in_detail.specification_model AS specification_model,
+                            warehousing_in_detail.type_machine AS type_machine,
+                            warehousing_in_detail.inventory_unit AS inventory_unit,
+                            SUM( warehousing_in_detail.warehousing_quantity ) AS `count`,
+                            warehousing_in_info.stock_number AS stock_number,
+                            warehousing_in_info.stock_name AS stock_name,
+                            warehousing_in_info.enterprise_code AS enterprise_code,
+                            warehousing_in_info.enterprise_name AS enterprise_name,
+                            warehousing_in_detail.storage_location AS storage_location
+                        FROM
+                            warehousing_in_detail,
+                            warehousing_in_info
+                        WHERE
+                                warehousing_in_detail.warehousing_number = warehousing_in_info.warehousing_number
+                        GROUP BY
+                            warehousing_in_detail.material_code UNION ALL
+                        SELECT
+                            outbound_detail.material_code AS material_code,
+                            outbound_detail.material_name AS material_name,
+                            outbound_info.material_type AS material_type,
+                            outbound_detail.batch_number AS batch_number,
+                            outbound_detail.specification_model AS specification_model,
+                            outbound_detail.type_machine AS type_machine,
+                            outbound_detail.inventory_unit AS inventory_unit,
+                            - SUM( outbound_detail.actual_count ) AS `count`,
+                            outbound_info.stock_no AS stock_number,
+                            outbound_info.stock_name AS stock_name,
+                            outbound_info.enterprise_code AS enterprise_code,
+                            outbound_info.enterprise_name AS enterprise_name,
+                            outbound_detail.storage_location AS storage_location
+                        FROM
+                            outbound_detail,
+                            outbound_info
+                        WHERE
+                            outbound_detail.outbound_no = outbound_info.outbound_no
+                        GROUP BY
+                            outbound_detail.material_code
+                    ) AS tabletemp
+                GROUP BY
+                    material_code
+            ) AS `bbb`
+        WHERE ccc.material_code = bbb.material_code
    </sql>

 <!--    <select id="selectWarehousingStagnantMaterialList" parameterType="WarehousingStagnantMaterial" resultMap="WarehousingStagnantMaterialResult">-->
--- a/ruoyi-admin/src/main/resources/mapper/system/SysBomMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysBomMapper.xml
@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="finishProductCode"    column="finish_product_code"    />
        <result property="finishProductName"    column="finish_product_name"    />
        <result property="specificationModel"    column="specification_model"    />
+        <result property="typeMachine"    column="type_machine"    />
        <result property="inventoryUnit"    column="inventory_unit"    />
        <result property="currentVersion"    column="current_version"    />
        <result property="confirmNo"    column="confirm_no"    />
@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <sql id="selectSysBomVo">
-        select bom_id, version_number, bom_code, bom_name, bom_production_cost, bom_remarks, bom_creator, enterprise_name, bom_time, enterprise_code, customer_number, finish_product_code, finish_product_name, specification_model, inventory_unit, current_version, confirm_no, confirm_name, confirm_time, first_add_time, update_info_time from sys_bom
+        select bom_id, version_number, bom_code, bom_name, bom_production_cost, bom_remarks, bom_creator, enterprise_name, bom_time, enterprise_code, customer_number, finish_product_code, finish_product_name, specification_model, type_machine, inventory_unit, current_version, confirm_no, confirm_name, confirm_time, first_add_time, update_info_time from sys_bom
    </sql>

    <select id="selectSysBomList" parameterType="SysBom" resultMap="SysBomResult">
@ -39,8 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="bomName != null  and bomName != ''"> and bom_name like concat('%', #{bomName}, '%')</if>
            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code = #{enterpriseCode}</if>
            <if test="customerNumber != null  and customerNumber != ''"> and customer_number = #{customerNumber}</if>
+            <if test="typeMachine != null  and typeMachine != ''"> and type_machine like concat('%', #{typeMachine}, '%')</if>
            <if test="finishProductCode != null  and finishProductCode != ''"> and finish_product_code = #{finishProductCode}</if>
            <if test="confirmNo != null  and confirmNo != ''"> and confirm_no = #{confirmNo}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(first_add_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(first_add_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
        </where>
    </select>
    
@ -65,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="finishProductCode != null">finish_product_code,</if>
            <if test="finishProductName != null">finish_product_name,</if>
            <if test="specificationModel != null">specification_model,</if>
+            <if test="typeMachine != null">type_machine,</if>
            <if test="inventoryUnit != null">inventory_unit,</if>
            <if test="currentVersion != null">current_version,</if>
            <if test="confirmNo != null">confirm_no,</if>
@ -86,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="finishProductCode != null">#{finishProductCode},</if>
            <if test="finishProductName != null">#{finishProductName},</if>
            <if test="specificationModel != null">#{specificationModel},</if>
+            <if test="typeMachine != null">#{typeMachine},</if>
            <if test="inventoryUnit != null">#{inventoryUnit},</if>
            <if test="currentVersion != null">#{currentVersion},</if>
            <if test="confirmNo != null">#{confirmNo},</if>
@ -111,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="finishProductCode != null">finish_product_code = #{finishProductCode},</if>
            <if test="finishProductName != null">finish_product_name = #{finishProductName},</if>
            <if test="specificationModel != null">specification_model = #{specificationModel},</if>
+            <if test="typeMachine != null">type_machine = #{typeMachine},</if>
            <if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
            <if test="currentVersion != null">current_version = #{currentVersion},</if>
            <if test="confirmNo != null">confirm_no = #{confirmNo},</if>
--- a/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <select id="selectSysShippingAddressList" parameterType="SysShippingAddress" resultMap="SysShippingAddressResult">
        <include refid="selectSysShippingAddressVo"/>
        <where>  
+            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
            <if test="deliveryAddress != null  and deliveryAddress != ''"> and delivery_address like concat('%', #{deliveryAddress}, '%')</if>
--- a/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoCP/outboundInfoCP.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoCP/outboundInfoCP.html
@ -62,28 +62,28 @@
                                    <label>备注内容：</label>
                                    <input type="text" name="outboundRemarks"/>
                                </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
+<!--                            <li>-->
+<!--                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>-->
+<!--                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>-->
+<!--                            </li>-->
                        </ul>
                    </div>
                </form>
            </div>

            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="storehouse:outboundInfo:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:outboundInfo:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:outboundInfo:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:outboundInfo:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="storehouse:outboundInfo:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:outboundInfo:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:outboundInfo:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:outboundInfo:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table"></table>
@ -159,17 +159,19 @@
                {
                    field: 'outboundRemarks',
                    title: '备注内容'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outboundId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.outboundId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
+                }
+                // ,
+                // {
+                //     title: '操作',
+                //     align: 'center',
+                //     formatter: function(value, row, index) {
+                //         var actions = [];
+                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outboundId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.outboundId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                //         return actions.join('');
+                //     }
+                // }
+                ]
            };
            $.table.init(options);
        });
--- a/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoFL/outboundInfoFL.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoFL/outboundInfoFL.html
@ -66,28 +66,28 @@
                                <label>备注内容：</label>
                                <input type="text" name="outboundRemarks"/>
                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
+<!--                            <li>-->
+<!--                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>-->
+<!--                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>-->
+<!--                            </li>-->
                        </ul>
                    </div>
                </form>
            </div>

            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="storehouse:outboundInfo:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:outboundInfo:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:outboundInfo:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:outboundInfo:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="storehouse:outboundInfo:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:outboundInfo:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:outboundInfo:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:outboundInfo:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table"></table>
@ -174,17 +174,19 @@
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(materialTypeDatas, value);
                    }
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outboundId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.outboundId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
+                }
+                // ,
+                // {
+                //     title: '操作',
+                //     align: 'center',
+                //     formatter: function(value, row, index) {
+                //         var actions = [];
+                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outboundId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.outboundId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                //         return actions.join('');
+                //     }
+                // }
+                ]
            };
            $.table.init(options);
        });
--- a/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoYL/outboundInfoYL.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoYL/outboundInfoYL.html
@ -66,28 +66,28 @@
                                <label>备注内容：</label>
                                <input type="text" name="outboundRemarks"/>
                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
+<!--                            <li>-->
+<!--                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>-->
+<!--                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>-->
+<!--                            </li>-->
                        </ul>
                    </div>
                </form>
            </div>

            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="storehouse:outboundInfo:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:outboundInfo:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:outboundInfo:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:outboundInfo:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="storehouse:outboundInfo:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:outboundInfo:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:outboundInfo:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:outboundInfo:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table"></table>
@ -174,17 +174,19 @@
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(materialTypeDatas, value);
                    }
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outboundId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.outboundId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
+                }
+                // ,
+                // {
+                //     title: '操作',
+                //     align: 'center',
+                //     formatter: function(value, row, index) {
+                //         var actions = [];
+                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outboundId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.outboundId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                //         return actions.join('');
+                //     }
+                // }
+                ]
            };
            $.table.init(options);
        });
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/add.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/add.html
@ -387,6 +387,12 @@
                        validate: function (v) {

                        }
+                    },
+                    formatter: (value, row, index) => {
+                        console.log(value)
+                        if (value === null) {
+                            return ''
+                        }
                    }
                },
                {
@ -399,6 +405,12 @@
                        validate: function (v) {

                        }
+                    },
+                    formatter: (value, row, index) => {
+                        console.log(value)
+                        if (value === null) {
+                            return ''
+                        }
                    }
                },
                {
@ -411,6 +423,12 @@
                        validate: function (v) {

                        }
+                    },
+                    formatter: (value, row, index) => {
+                        console.log(value)
+                        if (value === null) {
+                            return ''
+                        }
                    }
                }]
        })
@ -450,7 +468,7 @@
                                        specificationModel: data[i].specificationModel,
                                        materialType: data[i].materialType,
                                        inventoryUnit: data[i].purchasingUnit,
-                                        warehousingQuantity: data[i].warehousingQuantity,
+                                        warehousingQuantity: data[i].qualifiedQuantity,
                                        unitPrice: data2[i].purchasePrice,
                                        amountMoney: '',
                                        description: data[i].purchaseExplain,
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/edit.html
@ -346,11 +346,27 @@
                },
                {
                    field: 'description',
-                    title: '说明'
+                    title: '说明',
+                    editable: {
+                        type: 'text',
+                        title: '说明',
+                        emptytext: '说明',
+                        validate: function (v) {
+
+                        }
+                    }
                },
                {
                    field: 'batchNumber',
-                    title: '进货批号'
+                    title: '进货批号',
+                    editable: {
+                        type: 'text',
+                        title: '进货批号',
+                        emptytext: '进货批号',
+                        validate: function (v) {
+
+                        }
+                    }
                },
                {
                    field: 'manufacturerBatchNumber',
@ -413,7 +429,7 @@
                                        specificationModel: data[i].specificationModel,
                                        materialType: data[i].materialType,
                                        inventoryUnit: data[i].purchasingUnit,
-                                        warehousingQuantity: data[i].warehousingQuantity,
+                                        warehousingQuantity: data[i].qualifiedQuantity,
                                        unitPrice: data2[i].purchasePrice,
                                        amountMoney: '',
                                        description: data[i].purchaseExplain,
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/add.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/add.html
@ -404,7 +404,7 @@
                                specificationModel: data[i].specificationModel,
                                typeMachine: data[i].typeMachine,
                                inventoryUnit: data[i].inventoryUnit,
-                                warehousingQuantity: data[i].warehousingQuantity,
+                                warehousingQuantity: data[i].qualifiedQuantity,
                                description: data[i].description,
                                batchNumber: data[i].batchNumber,
                                storageLocation: ''
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/edit.html
@ -384,7 +384,7 @@
                                specificationModel: data[i].specificationModel,
                                typeMachine: data[i].typeMachine,
                                inventoryUnit: data[i].inventoryUnit,
-                                warehousingQuantity: data[i].warehousingQuantity,
+                                warehousingQuantity: data[i].qualifiedQuantity,
                                description: data[i].description,
                                batchNumber: data[i].batchNumber,
                                storageLocation: ''
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/add.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/add.html
@ -398,7 +398,7 @@
                                specificationModel: data[i].specificationModel,
                                materialType: data[i].materialType,
                                inventoryUnit: data[i].purchasingUnit,
-                                warehousingQuantity: data[i].warehousingQuantity,
+                                warehousingQuantity: data[i].qualifiedQuantity,
                                description: data[i].purchaseExplain,
                                batchNumber: data[i].receiptBatchNumber,
                                manufacturerBatchNumber: data[i].manufacturerBatchNumber,
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/edit.html
@ -294,15 +294,39 @@
                },
                {
                    field: 'warehousingQuantity',
-                    title: '合格数量'
+                    title: '合格数量',
+                    editable: {
+                        type: 'text',
+                        title: '合格数量',
+                        emptytext: '合格数量',
+                        validate: function (v) {
+
+                        }
+                    }
                },
                {
                    field: 'description',
-                    title: '说明'
+                    title: '说明',
+                    editable: {
+                        type: 'text',
+                        title: '说明',
+                        emptytext: '说明',
+                        validate: function (v) {
+
+                        }
+                    }
                },
                {
                    field: 'batchNumber',
-                    title: '进货批号'
+                    title: '进货批号',
+                    editable: {
+                        type: 'text',
+                        title: '进货批号',
+                        emptytext: '进货批号',
+                        validate: function (v) {
+
+                        }
+                    }
                },
                {
                    field: 'manufacturerBatchNumber',
@ -355,7 +379,7 @@
                                specificationModel: data[i].specificationModel,
                                materialType: data[i].materialType,
                                inventoryUnit: data[i].purchasingUnit,
-                                warehousingQuantity: data[i].warehousingQuantity,
+                                warehousingQuantity: data[i].qualifiedQuantity,
                                description: data[i].purchaseExplain,
                                batchNumber: data[i].receiptBatchNumber,
                                manufacturerBatchNumber: '',
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/add.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/add.html
@ -399,7 +399,7 @@
                                specificationModel: data[i].specificationModel,
                                materialType: data[i].materialType,
                                inventoryUnit: data[i].purchasingUnit,
-                                warehousingQuantity: data[i].warehousingQuantity,
+                                warehousingQuantity: data[i].qualifiedQuantity,
                                description: data[i].purchaseExplain,
                                batchNumber: data[i].receiptBatchNumber,
                                manufacturerBatchNumber: data[i].manufacturerBatchNumber,
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/edit.html
@ -293,15 +293,39 @@
                },
                {
                    field: 'warehousingQuantity',
-                    title: '合格数量'
+                    title: '合格数量',
+                    editable: {
+                        type: 'text',
+                        title: '合格数量',
+                        emptytext: '合格数量',
+                        validate: function (v) {
+
+                        }
+                    }
                },
                {
                    field: 'description',
-                    title: '说明'
+                    title: '说明',
+                    editable: {
+                        type: 'text',
+                        title: '说明',
+                        emptytext: '说明',
+                        validate: function (v) {
+
+                        }
+                    }
                },
                {
                    field: 'batchNumber',
-                    title: '进货批号'
+                    title: '进货批号',
+                    editable: {
+                        type: 'text',
+                        title: '进货批号',
+                        emptytext: '进货批号',
+                        validate: function (v) {
+
+                        }
+                    }
                },
                {
                    field: 'manufacturerBatchNumber',
@ -354,7 +378,7 @@
                                specificationModel: data[i].specificationModel,
                                materialType: data[i].materialType,
                                inventoryUnit: data[i].purchasingUnit,
-                                warehousingQuantity: data[i].warehousingQuantity,
+                                warehousingQuantity: data[i].qualifiedQuantity,
                                description: data[i].purchaseExplain,
                                batchNumber: data[i].receiptBatchNumber,
                                manufacturerBatchNumber: '',
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html
@ -58,7 +58,6 @@
        var materialTypeDatas = [[${@dict.getType('ck_meterialt_type')}]];
        var prefix = ctx + "storehouse/warehousingStagnantMaterial";

-
        $(function() {
            searchDetail();
        });
@ -125,7 +124,12 @@
                    },
                    {
                        field: 'inventoryQuantity',
-                        title: '库存数'
+                        title: '库存数',
+                        formatter: (value, row, index) => {
+                            if (value !== null || value !== '') {
+                                return parseFloat(value).toFixed(2)
+                            }
+                        }
                    }]
            };
            $.table.init(options);
@ -179,7 +183,12 @@
                    },
                    {
                        field: 'inventoryQuantity',
-                        title: '库存数'
+                        title: '库存数',
+                        formatter: (value, row, index) => {
+                            if (value !== null || value !== '') {
+                                return parseFloat(value).toFixed(2)
+                            }
+                        }
                    }]
            };
            $.table.init(options);
--- a/ruoyi-admin/src/main/resources/templates/system/bom/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/bom/add.html
@ -55,46 +55,46 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
    <form class="form-horizontal m" id="form-bom-add">

-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">清单编号：</label>
-            <div class="col-sm-8">
-                <input name="bomCode" class="form-control" type="text" required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">清单名称：</label>
-            <div class="col-sm-8">
-                <input name="bomName" class="form-control" type="text" required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">生产费用：</label>
-            <div class="col-sm-8">
-                <input name="bomProductionCost" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">备注：</label>
-            <div class="col-sm-8">
-                <textarea name="bomRemarks" class="form-control"></textarea>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">创建人：</label>
-            <div class="col-sm-8">
-                <input name="bomCreator" class="form-control" type="text">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label class="col-sm-3 control-label">创建时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="bomTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">清单编号：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomCode" class="form-control" type="text" >-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label ">清单名称：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomName" class="form-control" type="text" >-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">生产费用：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomProductionCost" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">备注：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <textarea name="bomRemarks" class="form-control"></textarea>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">创建人：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomCreator" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">创建时间：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <div class="input-group date">-->
+<!--                    <input name="bomTime" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+<!--                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->

        <div class="get-finish-product">
            <h4>选择成品信息</h4>
@ -149,6 +149,12 @@
                <input name="specificationModel" class="form-control" type="text" >
            </div>
        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">机种：</label>
+            <div class="col-sm-8">
+                <input name="typeMachine" class="form-control" type="text" >
+            </div>
+        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label">单位：</label>
            <div class="col-sm-8">
--- a/ruoyi-admin/src/main/resources/templates/system/bom/bom.html
+++ b/ruoyi-admin/src/main/resources/templates/system/bom/bom.html
@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
    <th:block th:include="include :: header('BOM列表')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
    <script type="text/javascript" th:src="@{/js/axios.min.js}"></script>
 </head>
 <body class="gray-bg">
@ -11,14 +12,14 @@
            <form id="formId">
                <div class="select-list">
                    <ul>
-                        <li>
-                            <label>清单编号：</label>
-                            <input type="text" name="bomCode"/>
-                        </li>
-                        <li>
-                            <label>清单名称：</label>
-                            <input type="text" name="bomName"/>
-                        </li>
+<!--                        <li>-->
+<!--                            <label>清单编号：</label>-->
+<!--                            <input type="text" name="bomCode"/>-->
+<!--                        </li>-->
+<!--                        <li>-->
+<!--                            <label>清单名称：</label>-->
+<!--                            <input type="text" name="bomName"/>-->
+<!--                        </li>-->
                        <li>
                            <label>客户代码：</label>
                            <input type="text" name="enterpriseCode"/>
@ -36,6 +37,16 @@
                            <input type="text" name="finishProductCode"/>

                        </li>
+                        <li>
+                            <label>机种：</label>
+                            <input type="text" name="typeMachine"/>
+                        </li>
+                        <li class="select-time">
+                            <label>创建时间： </label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                        </li>
                        <li>
                            <label>确认否：</label>
                            <select name="confirmNo" th:with="type=${@dict.getType('sys_whether')}">
@ -178,38 +189,38 @@
                        return actions.join('');
                    }
                },
-                {
-                    field: 'bomCode',
-                    title: '清单编号'
-                },
-                {
-                    field: 'bomName',
-                    title: '清单名称'
-                },
-                {
-                    field: 'bomProductionCost',
-                    title: '生产费用'
-                },
+                // {
+                //     field: 'bomCode',
+                //     title: '清单编号'
+                // },
+                // {
+                //     field: 'bomName',
+                //     title: '清单名称'
+                // },
+                // {
+                //     field: 'bomProductionCost',
+                //     title: '生产费用'
+                // },
                {
                    field: 'versionNumber',
                    title: '版本号'
                },
-                {
-                    field: 'bomRemarks',
-                    title: '备注'
-                },
-                {
-                    field: 'bomCreator',
-                    title: '创建人'
-                },
+                // {
+                //     field: 'bomRemarks',
+                //     title: '备注'
+                // },
+                // {
+                //     field: 'bomCreator',
+                //     title: '创建人'
+                // },
                {
                    field: 'enterpriseName',
                    title: '客户名称'
                },
-                {
-                    field: 'bomTime',
-                    title: '创建时间'
-                },
+                // {
+                //     field: 'bomTime',
+                //     title: '创建时间'
+                // },
                {
                    field: 'enterpriseCode',
                    title: '客户代码'
@ -230,6 +241,10 @@
                    field: 'specificationModel',
                    title: '规格型号'
                },
+                {
+                    field: 'typeMachine',
+                    title: '机种'
+                },
                {
                    field: 'inventoryUnit',
                    title: '单位'
--- a/ruoyi-admin/src/main/resources/templates/system/bom/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/bom/edit.html
@ -60,46 +60,46 @@
    <form class="form-horizontal m" id="form-bom-edit" th:object="${sysBom}">
        <input name="bomId" th:field="*{bomId}" type="hidden">

-        <div class="form-group">
-            <label class="col-sm-3 control-label">清单编号：</label>
-            <div class="col-sm-8">
-                <input name="bomCode" th:field="*{bomCode}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">清单名称：</label>
-            <div class="col-sm-8">
-                <input name="bomName" th:field="*{bomName}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">生产费用：</label>
-            <div class="col-sm-8">
-                <input name="bomProductionCost" th:field="*{bomProductionCost}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">备注：</label>
-            <div class="col-sm-8">
-                <textarea name="bomRemarks" class="form-control">[[*{bomRemarks}]]</textarea>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">创建人：</label>
-            <div class="col-sm-8">
-                <input name="bomCreator" th:field="*{bomCreator}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">创建时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="bomTime" th:value="*{bomTime}" class="form-control" placeholder="yyyy-MM-dd"
-                           type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">清单编号：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomCode" th:field="*{bomCode}" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">清单名称：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomName" th:field="*{bomName}" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">生产费用：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomProductionCost" th:field="*{bomProductionCost}" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">备注：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <textarea name="bomRemarks" class="form-control">[[*{bomRemarks}]]</textarea>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">创建人：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomCreator" th:field="*{bomCreator}" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">创建时间：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <div class="input-group date">-->
+<!--                    <input name="bomTime" th:value="*{bomTime}" class="form-control" placeholder="yyyy-MM-dd"-->
+<!--                           type="text">-->
+<!--                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
        <div class="get-finish-product">
            <h4>选择成品信息</h4>
        </div>
@ -153,6 +153,12 @@
                <input name="specificationModel" th:field="*{specificationModel}" class="form-control" type="text">
            </div>
        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">机种：</label>
+            <div class="col-sm-8">
+                <input name="typeMachine" th:field="*{typeMachine}" class="form-control" type="text" >
+            </div>
+        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label">单位：</label>
            <div class="col-sm-8">
--- a/ruoyi-admin/src/main/resources/templates/system/companyInformation/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/companyInformation/add.html
@ -3,6 +3,8 @@
 <head>
    <th:block th:include="include :: header('新增公司信息')" />
    <th:block th:include="include :: datetimepicker-css" />
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
 </head>
 <body class="white-bg">
    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -165,7 +167,7 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label">外币注册：</label>
                <div class="col-sm-8">
-                    <select name="foreignCurrencyRegistration" class="form-control m-b" th:with="type=${@dict.getType('sys_foreign_currency_registration')}">
+                    <select name="foreignCurrencyRegistration" class="form-control m-b" th:with="type=${@dict.getType('sys_coin_class')}">
                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                    </select>
                </div>
@ -180,6 +182,7 @@
    </div>
    <th:block th:include="include :: footer" />
    <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: select2-js"/>
    <script th:inline="javascript">
        var prefix = ctx + "system/companyInformation"
        $("#form-companyInformation-add").validate({
--- a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
+++ b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
@ -24,21 +24,21 @@
            </div>

            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:companyInformation:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:companyInformation:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:companyInformation:edit">
                    <i class="fa fa-edit"></i> 修改
                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:companyInformation:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:companyInformation:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:companyInformation:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">-->
+<!--                    <i class="fa fa-upload"></i> 导入-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:companyInformation:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table" style="white-space:nowrap"></table>
@ -53,7 +53,7 @@
        var enterpriseNatureDatas = [[${@dict.getType('sys_enterprise_nature')}]];
        var importDeclarantDatas = [[${@dict.getType('sys_import_declarant')}]];
        var exportDeclarantDatas = [[${@dict.getType('sys_export_declarant')}]];
-        var foreignCurrencyRegistrationDatas = [[${@dict.getType('sys_foreign_currency_registration')}]];
+        var foreignCurrencyRegistrationDatas = [[${@dict.getType('sys_coin_class')}]];
        var prefix = ctx + "system/companyInformation";

        $(function() {
--- a/ruoyi-admin/src/main/resources/templates/system/companyInformation/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/companyInformation/edit.html
@ -3,6 +3,8 @@
 <head>
    <th:block th:include="include :: header('修改公司信息')" />
    <th:block th:include="include :: datetimepicker-css" />
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
 </head>
 <body class="white-bg">
    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -166,7 +168,7 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label">外币注册：</label>
                <div class="col-sm-8">
-                    <select name="foreignCurrencyRegistration" class="form-control m-b" th:with="type=${@dict.getType('sys_foreign_currency_registration')}">
+                    <select name="foreignCurrencyRegistration" class="form-control m-b" th:with="type=${@dict.getType('sys_coin_class')}">
                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{foreignCurrencyRegistration}"></option>
                    </select>
                </div>
@ -181,6 +183,7 @@
    </div>
    <th:block th:include="include :: footer" />
    <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: select2-js"/>
    <script th:inline="javascript">
        var prefix = ctx + "system/companyInformation";
        $("#form-companyInformation-edit").validate({
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@ -12,7 +12,7 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label is-required">客户/企业代码：</label>
                <div class="col-sm-8">
-                    <input name="enterpriseCode" class="form-control" type="text" required>
+                    <input name="enterpriseCode" class="form-control" type="text" required >
                </div>
            </div>
            <div class="form-group">    
@ -309,6 +309,7 @@
    <th:block th:include="include :: datetimepicker-js" />
    <script th:inline="javascript">
        var prefix = ctx + "system/customer"
+        var prefixShippingaddress = ctx + "system/shippingaddress";
        $("#form-customer-add").validate({
            focusCleanup: true
        });
@ -324,6 +325,7 @@
            minView: "month",
            autoclose: true
        });
+
    </script>
 </body>
 </html>
--- a/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class
+++ b/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class
--- a/ruoyi-admin/target/classes/com/ruoyi/manufacture/mapper/MaterialRequisitionInfoMapper.class
+++ b/ruoyi-admin/target/classes/com/ruoyi/manufacture/mapper/MaterialRequisitionInfoMapper.class
--- a/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.class
+++ b/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.class
--- a/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.class
+++ b/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.class
--- a/ruoyi-admin/target/classes/com/ruoyi/system/domain/SysBom.class
+++ b/ruoyi-admin/target/classes/com/ruoyi/system/domain/SysBom.class
--- a/ruoyi-admin/target/classes/mapper/manufacture/MaterialRequisitionInfoMapper.xml
+++ b/ruoyi-admin/target/classes/mapper/manufacture/MaterialRequisitionInfoMapper.xml
@ -45,7 +45,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="getMaterialFlag != null  and getMaterialFlag != ''"> and get_material_flag = #{getMaterialFlag}</if>
        </where>
    </select>
-    
+    <select id="selectMaterialRequisitionInfoListRaw" parameterType="MaterialRequisitionInfo" resultMap="MaterialRequisitionInfoResult">
+        <include refid="selectMaterialRequisitionInfoVo"/>
+        <where>
+            material_requisition_number like '%YLLL%'
+            <if test="materialRequisitionNumber != null  and materialRequisitionNumber != ''"> and material_requisition_number like concat('%', #{materialRequisitionNumber}, '%')</if>
+            <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
+            <if test="workOrderNumber != null  and workOrderNumber != ''"> and work_order_number like concat('%', #{workOrderNumber}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name = #{deptName}</if>
+            <if test="stockName != null  and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
+            <if test="outputClass != null  and outputClass != ''"> and output_class = #{outputClass}</if>
+            <if test="params.beginOutputDate != null and params.beginOutputDate != '' and params.endOutputDate != null and params.endOutputDate != ''"> and output_date between #{params.beginOutputDate} and #{params.endOutputDate}</if>
+            <if test="getMaterialFlag != null  and getMaterialFlag != ''"> and get_material_flag = #{getMaterialFlag}</if>
+        </where>
+    </select>
+    <select id="selectMaterialRequisitionInfoListSubsidiary" parameterType="MaterialRequisitionInfo" resultMap="MaterialRequisitionInfoResult">
+        <include refid="selectMaterialRequisitionInfoVo"/>
+        <where>
+            material_requisition_number like '%FLLL%'
+            <if test="materialRequisitionNumber != null  and materialRequisitionNumber != ''"> and material_requisition_number like concat('%', #{materialRequisitionNumber}, '%')</if>
+            <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
+            <if test="workOrderNumber != null  and workOrderNumber != ''"> and work_order_number like concat('%', #{workOrderNumber}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name = #{deptName}</if>
+            <if test="stockName != null  and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
+            <if test="outputClass != null  and outputClass != ''"> and output_class = #{outputClass}</if>
+            <if test="params.beginOutputDate != null and params.beginOutputDate != '' and params.endOutputDate != null and params.endOutputDate != ''"> and output_date between #{params.beginOutputDate} and #{params.endOutputDate}</if>
+            <if test="getMaterialFlag != null  and getMaterialFlag != ''"> and get_material_flag = #{getMaterialFlag}</if>
+        </where>
+    </select>
+    <select id="selectMaterialRequisitionInfoListBcp" parameterType="MaterialRequisitionInfo" resultMap="MaterialRequisitionInfoResult">
+        <include refid="selectMaterialRequisitionInfoVo"/>
+        <where>
+            material_requisition_number like '%CPLL%'
+            <if test="materialRequisitionNumber != null  and materialRequisitionNumber != ''"> and material_requisition_number like concat('%', #{materialRequisitionNumber}, '%')</if>
+            <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
+            <if test="workOrderNumber != null  and workOrderNumber != ''"> and work_order_number like concat('%', #{workOrderNumber}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name = #{deptName}</if>
+            <if test="stockName != null  and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
+            <if test="outputClass != null  and outputClass != ''"> and output_class = #{outputClass}</if>
+            <if test="params.beginOutputDate != null and params.beginOutputDate != '' and params.endOutputDate != null and params.endOutputDate != ''"> and output_date between #{params.beginOutputDate} and #{params.endOutputDate}</if>
+            <if test="getMaterialFlag != null  and getMaterialFlag != ''"> and get_material_flag = #{getMaterialFlag}</if>
+        </where>
+    </select>
+
    <select id="selectMaterialRequisitionInfoById" parameterType="Long" resultMap="MaterialRequisitionInfoResult">
        <include refid="selectMaterialRequisitionInfoVo"/>
        where material_requisition_id = #{materialRequisitionId}
--- a/ruoyi-admin/target/classes/mapper/system/SysBomMapper.xml
+++ b/ruoyi-admin/target/classes/mapper/system/SysBomMapper.xml
@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="finishProductCode"    column="finish_product_code"    />
        <result property="finishProductName"    column="finish_product_name"    />
        <result property="specificationModel"    column="specification_model"    />
+        <result property="typeMachine"    column="type_machine"    />
        <result property="inventoryUnit"    column="inventory_unit"    />
        <result property="currentVersion"    column="current_version"    />
        <result property="confirmNo"    column="confirm_no"    />
@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <sql id="selectSysBomVo">
-        select bom_id, version_number, bom_code, bom_name, bom_production_cost, bom_remarks, bom_creator, enterprise_name, bom_time, enterprise_code, customer_number, finish_product_code, finish_product_name, specification_model, inventory_unit, current_version, confirm_no, confirm_name, confirm_time, first_add_time, update_info_time from sys_bom
+        select bom_id, version_number, bom_code, bom_name, bom_production_cost, bom_remarks, bom_creator, enterprise_name, bom_time, enterprise_code, customer_number, finish_product_code, finish_product_name, specification_model, type_machine, inventory_unit, current_version, confirm_no, confirm_name, confirm_time, first_add_time, update_info_time from sys_bom
    </sql>

    <select id="selectSysBomList" parameterType="SysBom" resultMap="SysBomResult">
@ -39,8 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="bomName != null  and bomName != ''"> and bom_name like concat('%', #{bomName}, '%')</if>
            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code = #{enterpriseCode}</if>
            <if test="customerNumber != null  and customerNumber != ''"> and customer_number = #{customerNumber}</if>
+            <if test="typeMachine != null  and typeMachine != ''"> and type_machine like concat('%', #{typeMachine}, '%')</if>
            <if test="finishProductCode != null  and finishProductCode != ''"> and finish_product_code = #{finishProductCode}</if>
            <if test="confirmNo != null  and confirmNo != ''"> and confirm_no = #{confirmNo}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(first_add_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(first_add_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
        </where>
    </select>
    
@ -65,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="finishProductCode != null">finish_product_code,</if>
            <if test="finishProductName != null">finish_product_name,</if>
            <if test="specificationModel != null">specification_model,</if>
+            <if test="typeMachine != null">type_machine,</if>
            <if test="inventoryUnit != null">inventory_unit,</if>
            <if test="currentVersion != null">current_version,</if>
            <if test="confirmNo != null">confirm_no,</if>
@ -86,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="finishProductCode != null">#{finishProductCode},</if>
            <if test="finishProductName != null">#{finishProductName},</if>
            <if test="specificationModel != null">#{specificationModel},</if>
+            <if test="typeMachine != null">#{typeMachine},</if>
            <if test="inventoryUnit != null">#{inventoryUnit},</if>
            <if test="currentVersion != null">#{currentVersion},</if>
            <if test="confirmNo != null">#{confirmNo},</if>
@ -111,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="finishProductCode != null">finish_product_code = #{finishProductCode},</if>
            <if test="finishProductName != null">finish_product_name = #{finishProductName},</if>
            <if test="specificationModel != null">specification_model = #{specificationModel},</if>
+            <if test="typeMachine != null">type_machine = #{typeMachine},</if>
            <if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
            <if test="currentVersion != null">current_version = #{currentVersion},</if>
            <if test="confirmNo != null">confirm_no = #{confirmNo},</if>
--- a/ruoyi-admin/target/classes/mapper/system/SysShippingAddressMapper.xml
+++ b/ruoyi-admin/target/classes/mapper/system/SysShippingAddressMapper.xml
@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <select id="selectSysShippingAddressList" parameterType="SysShippingAddress" resultMap="SysShippingAddressResult">
        <include refid="selectSysShippingAddressVo"/>
        <where>  
+            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
            <if test="deliveryAddress != null  and deliveryAddress != ''"> and delivery_address like concat('%', #{deliveryAddress}, '%')</if>
--- a/ruoyi-admin/target/classes/templates/system/bom/add.html
+++ b/ruoyi-admin/target/classes/templates/system/bom/add.html
@ -55,46 +55,46 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
    <form class="form-horizontal m" id="form-bom-add">

-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">清单编号：</label>
-            <div class="col-sm-8">
-                <input name="bomCode" class="form-control" type="text" required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">清单名称：</label>
-            <div class="col-sm-8">
-                <input name="bomName" class="form-control" type="text" required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">生产费用：</label>
-            <div class="col-sm-8">
-                <input name="bomProductionCost" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">备注：</label>
-            <div class="col-sm-8">
-                <textarea name="bomRemarks" class="form-control"></textarea>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">创建人：</label>
-            <div class="col-sm-8">
-                <input name="bomCreator" class="form-control" type="text">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label class="col-sm-3 control-label">创建时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="bomTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">清单编号：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomCode" class="form-control" type="text" >-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label ">清单名称：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomName" class="form-control" type="text" >-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">生产费用：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomProductionCost" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">备注：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <textarea name="bomRemarks" class="form-control"></textarea>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">创建人：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomCreator" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">创建时间：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <div class="input-group date">-->
+<!--                    <input name="bomTime" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+<!--                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->

        <div class="get-finish-product">
            <h4>选择成品信息</h4>
@ -149,6 +149,12 @@
                <input name="specificationModel" class="form-control" type="text" >
            </div>
        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">机种：</label>
+            <div class="col-sm-8">
+                <input name="typeMachine" class="form-control" type="text" >
+            </div>
+        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label">单位：</label>
            <div class="col-sm-8">
--- a/ruoyi-admin/target/classes/templates/system/bom/bom.html
+++ b/ruoyi-admin/target/classes/templates/system/bom/bom.html
@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
    <th:block th:include="include :: header('BOM列表')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
    <script type="text/javascript" th:src="@{/js/axios.min.js}"></script>
 </head>
 <body class="gray-bg">
@ -11,14 +12,14 @@
            <form id="formId">
                <div class="select-list">
                    <ul>
-                        <li>
-                            <label>清单编号：</label>
-                            <input type="text" name="bomCode"/>
-                        </li>
-                        <li>
-                            <label>清单名称：</label>
-                            <input type="text" name="bomName"/>
-                        </li>
+<!--                        <li>-->
+<!--                            <label>清单编号：</label>-->
+<!--                            <input type="text" name="bomCode"/>-->
+<!--                        </li>-->
+<!--                        <li>-->
+<!--                            <label>清单名称：</label>-->
+<!--                            <input type="text" name="bomName"/>-->
+<!--                        </li>-->
                        <li>
                            <label>客户代码：</label>
                            <input type="text" name="enterpriseCode"/>
@ -36,6 +37,16 @@
                            <input type="text" name="finishProductCode"/>

                        </li>
+                        <li>
+                            <label>机种：</label>
+                            <input type="text" name="typeMachine"/>
+                        </li>
+                        <li class="select-time">
+                            <label>创建时间： </label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                        </li>
                        <li>
                            <label>确认否：</label>
                            <select name="confirmNo" th:with="type=${@dict.getType('sys_whether')}">
@ -178,38 +189,38 @@
                        return actions.join('');
                    }
                },
-                {
-                    field: 'bomCode',
-                    title: '清单编号'
-                },
-                {
-                    field: 'bomName',
-                    title: '清单名称'
-                },
-                {
-                    field: 'bomProductionCost',
-                    title: '生产费用'
-                },
+                // {
+                //     field: 'bomCode',
+                //     title: '清单编号'
+                // },
+                // {
+                //     field: 'bomName',
+                //     title: '清单名称'
+                // },
+                // {
+                //     field: 'bomProductionCost',
+                //     title: '生产费用'
+                // },
                {
                    field: 'versionNumber',
                    title: '版本号'
                },
-                {
-                    field: 'bomRemarks',
-                    title: '备注'
-                },
-                {
-                    field: 'bomCreator',
-                    title: '创建人'
-                },
+                // {
+                //     field: 'bomRemarks',
+                //     title: '备注'
+                // },
+                // {
+                //     field: 'bomCreator',
+                //     title: '创建人'
+                // },
                {
                    field: 'enterpriseName',
                    title: '客户名称'
                },
-                {
-                    field: 'bomTime',
-                    title: '创建时间'
-                },
+                // {
+                //     field: 'bomTime',
+                //     title: '创建时间'
+                // },
                {
                    field: 'enterpriseCode',
                    title: '客户代码'
@ -230,6 +241,10 @@
                    field: 'specificationModel',
                    title: '规格型号'
                },
+                {
+                    field: 'typeMachine',
+                    title: '机种'
+                },
                {
                    field: 'inventoryUnit',
                    title: '单位'
--- a/ruoyi-admin/target/classes/templates/system/bom/edit.html
+++ b/ruoyi-admin/target/classes/templates/system/bom/edit.html
@ -60,46 +60,46 @@
    <form class="form-horizontal m" id="form-bom-edit" th:object="${sysBom}">
        <input name="bomId" th:field="*{bomId}" type="hidden">

-        <div class="form-group">
-            <label class="col-sm-3 control-label">清单编号：</label>
-            <div class="col-sm-8">
-                <input name="bomCode" th:field="*{bomCode}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">清单名称：</label>
-            <div class="col-sm-8">
-                <input name="bomName" th:field="*{bomName}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">生产费用：</label>
-            <div class="col-sm-8">
-                <input name="bomProductionCost" th:field="*{bomProductionCost}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">备注：</label>
-            <div class="col-sm-8">
-                <textarea name="bomRemarks" class="form-control">[[*{bomRemarks}]]</textarea>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">创建人：</label>
-            <div class="col-sm-8">
-                <input name="bomCreator" th:field="*{bomCreator}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">创建时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="bomTime" th:value="*{bomTime}" class="form-control" placeholder="yyyy-MM-dd"
-                           type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">清单编号：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomCode" th:field="*{bomCode}" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">清单名称：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomName" th:field="*{bomName}" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">生产费用：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomProductionCost" th:field="*{bomProductionCost}" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">备注：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <textarea name="bomRemarks" class="form-control">[[*{bomRemarks}]]</textarea>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">创建人：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="bomCreator" th:field="*{bomCreator}" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">创建时间：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <div class="input-group date">-->
+<!--                    <input name="bomTime" th:value="*{bomTime}" class="form-control" placeholder="yyyy-MM-dd"-->
+<!--                           type="text">-->
+<!--                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
        <div class="get-finish-product">
            <h4>选择成品信息</h4>
        </div>
@ -153,6 +153,12 @@
                <input name="specificationModel" th:field="*{specificationModel}" class="form-control" type="text">
            </div>
        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">机种：</label>
+            <div class="col-sm-8">
+                <input name="typeMachine" th:field="*{typeMachine}" class="form-control" type="text" >
+            </div>
+        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label">单位：</label>
            <div class="col-sm-8">
--- a/ruoyi-admin/target/classes/templates/system/companyInformation/add.html
+++ b/ruoyi-admin/target/classes/templates/system/companyInformation/add.html
@ -3,6 +3,8 @@
 <head>
    <th:block th:include="include :: header('新增公司信息')" />
    <th:block th:include="include :: datetimepicker-css" />
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
 </head>
 <body class="white-bg">
    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -165,7 +167,7 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label">外币注册：</label>
                <div class="col-sm-8">
-                    <select name="foreignCurrencyRegistration" class="form-control m-b" th:with="type=${@dict.getType('sys_foreign_currency_registration')}">
+                    <select name="foreignCurrencyRegistration" class="form-control m-b" th:with="type=${@dict.getType('sys_coin_class')}">
                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                    </select>
                </div>
@ -180,6 +182,7 @@
    </div>
    <th:block th:include="include :: footer" />
    <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: select2-js"/>
    <script th:inline="javascript">
        var prefix = ctx + "system/companyInformation"
        $("#form-companyInformation-add").validate({
--- a/ruoyi-admin/target/classes/templates/system/companyInformation/companyInformation.html
+++ b/ruoyi-admin/target/classes/templates/system/companyInformation/companyInformation.html
@ -24,21 +24,21 @@
            </div>

            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:companyInformation:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:companyInformation:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:companyInformation:edit">
                    <i class="fa fa-edit"></i> 修改
                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:companyInformation:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:companyInformation:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:companyInformation:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">-->
+<!--                    <i class="fa fa-upload"></i> 导入-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:companyInformation:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table" style="white-space:nowrap"></table>
@ -53,7 +53,7 @@
        var enterpriseNatureDatas = [[${@dict.getType('sys_enterprise_nature')}]];
        var importDeclarantDatas = [[${@dict.getType('sys_import_declarant')}]];
        var exportDeclarantDatas = [[${@dict.getType('sys_export_declarant')}]];
-        var foreignCurrencyRegistrationDatas = [[${@dict.getType('sys_foreign_currency_registration')}]];
+        var foreignCurrencyRegistrationDatas = [[${@dict.getType('sys_coin_class')}]];
        var prefix = ctx + "system/companyInformation";

        $(function() {
--- a/ruoyi-admin/target/classes/templates/system/companyInformation/edit.html
+++ b/ruoyi-admin/target/classes/templates/system/companyInformation/edit.html
@ -3,6 +3,8 @@
 <head>
    <th:block th:include="include :: header('修改公司信息')" />
    <th:block th:include="include :: datetimepicker-css" />
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
 </head>
 <body class="white-bg">
    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -166,7 +168,7 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label">外币注册：</label>
                <div class="col-sm-8">
-                    <select name="foreignCurrencyRegistration" class="form-control m-b" th:with="type=${@dict.getType('sys_foreign_currency_registration')}">
+                    <select name="foreignCurrencyRegistration" class="form-control m-b" th:with="type=${@dict.getType('sys_coin_class')}">
                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{foreignCurrencyRegistration}"></option>
                    </select>
                </div>
@ -181,6 +183,7 @@
    </div>
    <th:block th:include="include :: footer" />
    <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: select2-js"/>
    <script th:inline="javascript">
        var prefix = ctx + "system/companyInformation";
        $("#form-companyInformation-edit").validate({
--- a/ruoyi-admin/target/classes/templates/system/customer/add.html
+++ b/ruoyi-admin/target/classes/templates/system/customer/add.html
@ -12,7 +12,7 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label is-required">客户/企业代码：</label>
                <div class="col-sm-8">
-                    <input name="enterpriseCode" class="form-control" type="text" required>
+                    <input name="enterpriseCode" class="form-control" type="text" required >
                </div>
            </div>
            <div class="form-group">    
@ -309,6 +309,7 @@
    <th:block th:include="include :: datetimepicker-js" />
    <script th:inline="javascript">
        var prefix = ctx + "system/customer"
+        var prefixShippingaddress = ctx + "system/shippingaddress";
        $("#form-customer-add").validate({
            focusCleanup: true
        });
@ -324,6 +325,7 @@
            minView: "month",
            autoclose: true
        });
+
    </script>
 </body>
 </html>
--- a/ruoyi-common/ruoyi-common.iml
+++ b/ruoyi-common/ruoyi-common.iml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@ -1,9 +1,12 @@
 package com.ruoyi.common.core.domain.entity;

-import javax.validation.constraints.*;
+import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;

 /**
 * 部门表 sys_dept
@ -23,6 +26,8 @@ public class SysDept extends BaseEntity
    /** 祖级列表 */
    private String ancestors;

+    /** 部门编号 */
+    private String deptNumber;
    /** 部门名称 */
    private String deptName;

@ -77,6 +82,14 @@ public class SysDept extends BaseEntity
        this.ancestors = ancestors;
    }

+    public String getDeptNumber() {
+        return deptNumber;
+    }
+
+    public void setDeptNumber(String deptNumber) {
+        this.deptNumber = deptNumber;
+    }
+
    @NotBlank(message = "部门名称不能为空")
    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
    public String getDeptName()
@ -169,6 +182,7 @@ public class SysDept extends BaseEntity
            .append("deptId", getDeptId())
            .append("parentId", getParentId())
            .append("ancestors", getAncestors())
+            .append("deptNumber", getDeptNumber())
            .append("deptName", getDeptName())
            .append("orderNum", getOrderNum())
            .append("leader", getLeader())
--- a/ruoyi-framework/ruoyi-framework.iml
+++ b/ruoyi-framework/ruoyi-framework.iml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>
--- a/ruoyi-generator/ruoyi-generator.iml
+++ b/ruoyi-generator/ruoyi-generator.iml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>
--- a/ruoyi-quartz/ruoyi-quartz.iml
+++ b/ruoyi-quartz/ruoyi-quartz.iml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>
--- a/ruoyi-system/ruoyi-system.iml
+++ b/ruoyi-system/ruoyi-system.iml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<id     property="deptId"     column="dept_id"     />
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
+		<result property="deptNumber"  column="dept_number"   />
 		<result property="deptName"   column="dept_name"   />
 		<result property="orderNum"   column="order_num"   />
 		<result property="leader"     column="leader"      />
@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_number, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
        from sys_dept d
    </sql>
    
@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		insert into sys_dept(
 			<if test="deptId != null and deptId != 0">dept_id,</if>
 			<if test="parentId != null and parentId != 0">parent_id,</if>
+ 			<if test="deptNumber != null and deptNumber != ''">dept_number,</if>
 			<if test="deptName != null and deptName != ''">dept_name,</if>
 			<if test="ancestors != null and ancestors != ''">ancestors,</if>
 			<if test="orderNum != null and orderNum != ''">order_num,</if>
@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		)values(
 			<if test="deptId != null and deptId != 0">#{deptId},</if>
 			<if test="parentId != null and parentId != 0">#{parentId},</if>
+ 			<if test="deptNumber != null and deptNumber != ''">#{deptNumber},</if>
 			<if test="deptName != null and deptName != ''">#{deptName},</if>
 			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
 			<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept
 		<set>
 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+ 			<if test="deptNumber != null and deptNumber != ''">dept_number = #{deptNumber},</if>
 			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
 			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
--- a/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml
@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<id     property="deptId"     column="dept_id"     />
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
+		<result property="deptNumber"  column="dept_number"   />
 		<result property="deptName"   column="dept_name"   />
 		<result property="orderNum"   column="order_num"   />
 		<result property="leader"     column="leader"      />
@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_number, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
        from sys_dept d
    </sql>
    
@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		insert into sys_dept(
 			<if test="deptId != null and deptId != 0">dept_id,</if>
 			<if test="parentId != null and parentId != 0">parent_id,</if>
+ 			<if test="deptNumber != null and deptNumber != ''">dept_number,</if>
 			<if test="deptName != null and deptName != ''">dept_name,</if>
 			<if test="ancestors != null and ancestors != ''">ancestors,</if>
 			<if test="orderNum != null and orderNum != ''">order_num,</if>
@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		)values(
 			<if test="deptId != null and deptId != 0">#{deptId},</if>
 			<if test="parentId != null and parentId != 0">#{parentId},</if>
+ 			<if test="deptNumber != null and deptNumber != ''">#{deptNumber},</if>
 			<if test="deptName != null and deptName != ''">#{deptName},</if>
 			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
 			<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept
 		<set>
 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+ 			<if test="deptNumber != null and deptNumber != ''">dept_number = #{deptNumber},</if>
 			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
 			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
--- a/ruoyi.iml
+++ b/ruoyi.iml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="AGGREGATOR" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>