diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 412096ae..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/log.path_IS_UNDEFINED/sys-user.log b/log.path_IS_UNDEFINED/sys-user.log index ca8b579e..a72d9c33 100644 --- 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] - ====关闭缓存==== diff --git a/ruoyi-activiti/ruoyi-activiti.iml b/ruoyi-activiti/ruoyi-activiti.iml deleted file mode 100644 index d43e466c..00000000 --- a/ruoyi-activiti/ruoyi-activiti.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/ruoyi-admin.iml b/ruoyi-admin/ruoyi-admin.iml deleted file mode 100644 index a440d8c4..00000000 --- a/ruoyi-admin/ruoyi-admin.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.java index 779a16c6..920d30b2 100644 --- 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 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 list = materialRequisitionInfoService.selectMaterialRequisitionInfoList(materialRequisitionInfo); + List list = materialRequisitionInfoService.selectMaterialRequisitionInfoListRaw(materialRequisitionInfo); + return getDataTable(list); + } + @RequiresPermissions("manufacture:materialRequisitionInfo:listSubsidiary") + @PostMapping("/listSubsidiary") + @ResponseBody + public TableDataInfo listSubsidiary(MaterialRequisitionInfo materialRequisitionInfo) + { + startPage(); + List list = materialRequisitionInfoService.selectMaterialRequisitionInfoListSubsidiary(materialRequisitionInfo); + return getDataTable(list); + } + @RequiresPermissions("manufacture:materialRequisitionInfo:listBcp") + @PostMapping("/listBcp") + @ResponseBody + public TableDataInfo listBcp(MaterialRequisitionInfo materialRequisitionInfo) + { + startPage(); + List 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 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 MaterialRequisitionDetail1 = materialRequisitionDetailService.selectMaterialRequisitionDetailList(materialRequisitionDetail); - if (MaterialRequisitionDetail1.size()>0) { - for (int i=0;i list = materialRequisitionDetailService.selectMaterialRequisitionDetailList(materialRequisitionDetail); + if (list.size()>0) { + for (int j=0;j deptData = sysDictTypeService.selectDictDataByType("sys_dept_type"); - for (int i = 0;i deptData = sysDictTypeService.selectDictDataByType("sys_dept_type"); +// for (int i = 0;i selectMaterialRequisitionInfoList(MaterialRequisitionInfo materialRequisitionInfo); + public List selectMaterialRequisitionInfoListRaw(MaterialRequisitionInfo materialRequisitionInfo); + public List selectMaterialRequisitionInfoListSubsidiary(MaterialRequisitionInfo materialRequisitionInfo); + public List selectMaterialRequisitionInfoListBcp(MaterialRequisitionInfo materialRequisitionInfo); /** * 新增领料单 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.java index 95646636..e729a05f 100644 --- 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 selectMaterialRequisitionInfoList(MaterialRequisitionInfo materialRequisitionInfo); + /** + * 查询原料领料单列表 + * + * @param materialRequisitionInfo 原料领料单 + * @return 原料领料单集合 + */ + public List selectMaterialRequisitionInfoListRaw(MaterialRequisitionInfo materialRequisitionInfo); + + /** + * 查询辅料领料单列表 + * + * @param materialRequisitionInfo 辅料领料单 + * @return 辅料领料单集合 + */ + public List selectMaterialRequisitionInfoListSubsidiary(MaterialRequisitionInfo materialRequisitionInfo); + + /** + * 查询半成品领料单列表 + * + * @param materialRequisitionInfo 半成品领料单 + * @return 半成品领料单集合 + */ + public List 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(); } diff --git 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 index 5aadd453..f2e725b7 100644 --- 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 selectMaterialRequisitionInfoListRaw(MaterialRequisitionInfo materialRequisitionInfo) + { + return materialRequisitionInfoMapper.selectMaterialRequisitionInfoListRaw(materialRequisitionInfo); + } + @Override + public List selectMaterialRequisitionInfoListSubsidiary(MaterialRequisitionInfo materialRequisitionInfo) + { + return materialRequisitionInfoMapper.selectMaterialRequisitionInfoListSubsidiary(materialRequisitionInfo); + } + @Override + public List 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; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java index 9ded99ca..57213954 100644 --- 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 list = warehousingInInfoService.selectWarehousingInInfoList(warehousingInInfo); // return getDataTable(list); // } + + /** + * 查询入库列表 + */ @RequiresPermissions("storehouse:warehousingInInfo:listRaw") @PostMapping("/listRaw") @ResponseBody diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingStagnantMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingStagnantMaterialController.java index da511e1b..92b16cc6 100644 --- 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 list = warehousingStagnantMaterialService.selectStagnantMaterialOutList(warehousingStagnantMaterial); return getDataTable(list); } + + @PostMapping("/getAllCount") + @ResponseBody + public Integer getAllCount() { + return null; + } // // /** // * 导出呆滞物料列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBom.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBom.java index 7bfe258d..d6101d0c 100644 --- 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()) diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/MaterialRequisitionInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/MaterialRequisitionInfoMapper.xml index fb8938f9..505d5a56 100644 --- 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" and get_material_flag = #{getMaterialFlag} - + + + + @@ -39,8 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bom_name like concat('%', #{bomName}, '%') and enterprise_code = #{enterpriseCode} and customer_number = #{customerNumber} + and type_machine like concat('%', #{typeMachine}, '%') and finish_product_code = #{finishProductCode} and confirm_no = #{confirmNo} + + and date_format(first_add_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + + + and date_format(first_add_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + @@ -65,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" finish_product_code, finish_product_name, specification_model, + type_machine, inventory_unit, current_version, confirm_no, @@ -86,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{finishProductCode}, #{finishProductName}, #{specificationModel}, + #{typeMachine}, #{inventoryUnit}, #{currentVersion}, #{confirmNo}, @@ -111,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" finish_product_code = #{finishProductCode}, finish_product_name = #{finishProductName}, specification_model = #{specificationModel}, + type_machine = #{typeMachine}, inventory_unit = #{inventoryUnit}, current_version = #{currentVersion}, confirm_no = #{confirmNo}, diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml index f55168a2..317f1b0b 100644 --- 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" -
  • -  搜索 -  重置 -
    • + + + +
    @@ -159,17 +159,19 @@ { field: 'outboundRemarks', title: '备注内容' - }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); - } - }] + } + // , + // { + // title: '操作', + // align: 'center', + // formatter: function(value, row, index) { + // var actions = []; + // actions.push('编辑 '); + // actions.push('删除'); + // return actions.join(''); + // } + // } + ] }; $.table.init(options); }); diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoFL/outboundInfoFL.html b/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoFL/outboundInfoFL.html index 2e539b79..cdc23e0d 100644 --- 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 @@ -
  • -  搜索 -  重置 -
    • + + + +
    @@ -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('编辑 '); - actions.push('删除'); - return actions.join(''); - } - }] + } + // , + // { + // title: '操作', + // align: 'center', + // formatter: function(value, row, index) { + // var actions = []; + // actions.push('编辑 '); + // actions.push('删除'); + // return actions.join(''); + // } + // } + ] }; $.table.init(options); }); diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoYL/outboundInfoYL.html b/ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoYL/outboundInfoYL.html index a238d2ec..36cb8ea1 100644 --- 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 @@ -
  • -  搜索 -  重置 -
    • + + + +
    @@ -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('编辑 '); - actions.push('删除'); - return actions.join(''); - } - }] + } + // , + // { + // title: '操作', + // align: 'center', + // formatter: function(value, row, index) { + // var actions = []; + // actions.push('编辑 '); + // actions.push('删除'); + // return actions.join(''); + // } + // } + ] }; $.table.init(options); }); diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/add.html index fbc1e9eb..10281cf3 100644 --- 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, diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/edit.html index ecb5fb46..0055fcb5 100644 --- 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, diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/add.html index 97b2d56b..2e36d74e 100644 --- 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: '' diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/edit.html index c59de964..e9cf57e5 100644 --- 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: '' diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/add.html index c2a57af6..bd9b19e0 100644 --- 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, diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/edit.html index bdb1a58c..382c0b56 100644 --- 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: '', diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/add.html index 7eb65ed8..d14800ae 100644 --- 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, diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/edit.html index 73f92b56..5062ed32 100644 --- 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: '', diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html index 9ef85600..1c617c57 100644 --- 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); diff --git a/ruoyi-admin/src/main/resources/templates/system/bom/add.html b/ruoyi-admin/src/main/resources/templates/system/bom/add.html index 4ca7ff65..d658b5f8 100644 --- 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 @@
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - - -
    -
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    选择成品信息

    @@ -149,6 +149,12 @@
    +
    + +
    + +
    +
    diff --git a/ruoyi-admin/src/main/resources/templates/system/bom/bom.html b/ruoyi-admin/src/main/resources/templates/system/bom/bom.html index 5755907b..4ccb8b1d 100644 --- 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 @@ + @@ -11,14 +12,14 @@
      -
    • - - -
      • -
    • - - -
      • + + + + + + + +
    • @@ -36,6 +37,16 @@
      • +
    • + + +
      • +
    • + + + - + +
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      -
      - - -
      -
      -
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      选择成品信息

      @@ -153,6 +153,12 @@
    +
    + +
    + +
    +
    diff --git a/ruoyi-admin/src/main/resources/templates/system/companyInformation/add.html b/ruoyi-admin/src/main/resources/templates/system/companyInformation/add.html index e7223833..a69ce9fc 100644 --- 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 @@ + +
    @@ -165,7 +167,7 @@
    -
    @@ -180,6 +182,7 @@
    + \ No newline at end of file diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class index 3a4719f9..3d8950a2 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/mapper/MaterialRequisitionInfoMapper.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/mapper/MaterialRequisitionInfoMapper.class index 742fd623..15d6fb30 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/mapper/MaterialRequisitionInfoMapper.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/mapper/MaterialRequisitionInfoMapper.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.class index 4d084f51..a3b4dbaf 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/IMaterialRequisitionInfoService.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.class index 8df411ca..7be2c7ee 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/system/domain/SysBom.class b/ruoyi-admin/target/classes/com/ruoyi/system/domain/SysBom.class index 2e2cff20..809694ba 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/system/domain/SysBom.class and b/ruoyi-admin/target/classes/com/ruoyi/system/domain/SysBom.class differ diff --git a/ruoyi-admin/target/classes/mapper/manufacture/MaterialRequisitionInfoMapper.xml b/ruoyi-admin/target/classes/mapper/manufacture/MaterialRequisitionInfoMapper.xml index fb8938f9..505d5a56 100644 --- 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" and get_material_flag = #{getMaterialFlag} - + + + + @@ -39,8 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bom_name like concat('%', #{bomName}, '%') and enterprise_code = #{enterpriseCode} and customer_number = #{customerNumber} + and type_machine like concat('%', #{typeMachine}, '%') and finish_product_code = #{finishProductCode} and confirm_no = #{confirmNo} + + and date_format(first_add_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + + + and date_format(first_add_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + @@ -65,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" finish_product_code, finish_product_name, specification_model, + type_machine, inventory_unit, current_version, confirm_no, @@ -86,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{finishProductCode}, #{finishProductName}, #{specificationModel}, + #{typeMachine}, #{inventoryUnit}, #{currentVersion}, #{confirmNo}, @@ -111,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" finish_product_code = #{finishProductCode}, finish_product_name = #{finishProductName}, specification_model = #{specificationModel}, + type_machine = #{typeMachine}, inventory_unit = #{inventoryUnit}, current_version = #{currentVersion}, confirm_no = #{confirmNo}, diff --git a/ruoyi-admin/target/classes/mapper/system/SysShippingAddressMapper.xml b/ruoyi-admin/target/classes/mapper/system/SysShippingAddressMapper.xml index f55168a2..317f1b0b 100644 --- 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" -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - - -
    -
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    选择成品信息

    @@ -149,6 +149,12 @@
    +
    + +
    + +
    +
    diff --git a/ruoyi-admin/target/classes/templates/system/bom/bom.html b/ruoyi-admin/target/classes/templates/system/bom/bom.html index 5755907b..4ccb8b1d 100644 --- a/ruoyi-admin/target/classes/templates/system/bom/bom.html +++ b/ruoyi-admin/target/classes/templates/system/bom/bom.html @@ -2,6 +2,7 @@ + @@ -11,14 +12,14 @@
      -
    • - - -
      • -
    • - - -
      • + + + + + + + +
    • @@ -36,6 +37,16 @@
      • +
    • + + +
      • +
    • + + + - + +
    • -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      -
      - - -
      -
      -
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      选择成品信息

      @@ -153,6 +153,12 @@
    +
    + +
    + +
    +
    diff --git a/ruoyi-admin/target/classes/templates/system/companyInformation/add.html b/ruoyi-admin/target/classes/templates/system/companyInformation/add.html index e7223833..a69ce9fc 100644 --- a/ruoyi-admin/target/classes/templates/system/companyInformation/add.html +++ b/ruoyi-admin/target/classes/templates/system/companyInformation/add.html @@ -3,6 +3,8 @@ + +
    @@ -165,7 +167,7 @@
    -
    @@ -180,6 +182,7 @@
    + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common.iml b/ruoyi-common/ruoyi-common.iml deleted file mode 100644 index 1daccaec..00000000 --- a/ruoyi-common/ruoyi-common.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git 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 index c1cee372..dacb5f7d 100644 --- 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()) diff --git a/ruoyi-framework/ruoyi-framework.iml b/ruoyi-framework/ruoyi-framework.iml deleted file mode 100644 index 1daccaec..00000000 --- a/ruoyi-framework/ruoyi-framework.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ruoyi-generator/ruoyi-generator.iml b/ruoyi-generator/ruoyi-generator.iml deleted file mode 100644 index 1daccaec..00000000 --- a/ruoyi-generator/ruoyi-generator.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ruoyi-quartz/ruoyi-quartz.iml b/ruoyi-quartz/ruoyi-quartz.iml deleted file mode 100644 index 1daccaec..00000000 --- a/ruoyi-quartz/ruoyi-quartz.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ruoyi-system/ruoyi-system.iml b/ruoyi-system/ruoyi-system.iml deleted file mode 100644 index 1daccaec..00000000 --- a/ruoyi-system/ruoyi-system.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 431d9557..f491a953 100644 --- 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" + @@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_dept( dept_id, parent_id, + dept_number, dept_name, ancestors, order_num, @@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" )values( #{deptId}, #{parentId}, + #{deptNumber}, #{deptName}, #{ancestors}, #{orderNum}, @@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dept parent_id = #{parentId}, + dept_number = #{deptNumber}, dept_name = #{deptName}, ancestors = #{ancestors}, order_num = #{orderNum}, diff --git a/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml b/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml index 431d9557..f491a953 100644 --- 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" + @@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_dept( dept_id, parent_id, + dept_number, dept_name, ancestors, order_num, @@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" )values( #{deptId}, #{parentId}, + #{deptNumber}, #{deptName}, #{ancestors}, #{orderNum}, @@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dept parent_id = #{parentId}, + dept_number = #{deptNumber}, dept_name = #{deptName}, ancestors = #{ancestors}, order_num = #{orderNum}, diff --git a/ruoyi.iml b/ruoyi.iml deleted file mode 100644 index 2a13cb67..00000000 --- a/ruoyi.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file