diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/controller/VnaRawDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/controller/VnaRawDataController.java new file mode 100644 index 00000000..872a5ed7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/controller/VnaRawDataController.java @@ -0,0 +1,135 @@ +package com.ruoyi.rfMsg.controller; + +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.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.rfMsg.domain.VnaRawData; +import com.ruoyi.rfMsg.service.IVnaRawDataService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * rf测试历史结果Controller + * + * @author ruoyi + * @date 2023-06-28 + */ +@Controller +@RequestMapping("/rfMsg/vnaRawData") +public class VnaRawDataController extends BaseController +{ + private String prefix = "rfMsg/vnaRawData"; + + @Autowired + private IVnaRawDataService vnaRawDataService; + + @RequiresPermissions("rfMsg:vnaRawData:view") + @GetMapping() + public String vnaRawData() + { + return prefix + "/vnaRawData"; + } + + /** + * 查询rf测试历史结果列表 + */ + @RequiresPermissions("rfMsg:vnaRawData:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(VnaRawData vnaRawData) + { + startPage(); + List list = vnaRawDataService.selectVnaRawDataList(vnaRawData); + return getDataTable(list); + } + + @PostMapping("/getDataById/{id}") + @ResponseBody + public String getDataById(@PathVariable("id") Long id) + { + startPage(); + VnaRawData vnaRawData = vnaRawDataService.selectVnaRawDataById(id); + String frequency = vnaRawData.getFrequency(); +// JSONObject jsonObject = (JSONObject) JSONValue.parse(frequency.toJs()); + System.out.println(frequency); + return frequency; + } + + /** + * 导出rf测试历史结果列表 + */ + @RequiresPermissions("rfMsg:vnaRawData:export") + @Log(title = "rf测试历史结果", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(VnaRawData vnaRawData) + { + List list = vnaRawDataService.selectVnaRawDataList(vnaRawData); + ExcelUtil util = new ExcelUtil(VnaRawData.class); + return util.exportExcel(list, "rf测试历史结果数据"); + } + + /** + * 新增rf测试历史结果 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存rf测试历史结果 + */ + @RequiresPermissions("rfMsg:vnaRawData:add") + @Log(title = "rf测试历史结果", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(VnaRawData vnaRawData) + { + return toAjax(vnaRawDataService.insertVnaRawData(vnaRawData)); + } + + /** + * 修改rf测试历史结果 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + VnaRawData vnaRawData = vnaRawDataService.selectVnaRawDataById(id); + mmap.put("vnaRawData", vnaRawData); + return prefix + "/edit"; + } + + /** + * 修改保存rf测试历史结果 + */ + @RequiresPermissions("rfMsg:vnaRawData:edit") + @Log(title = "rf测试历史结果", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(VnaRawData vnaRawData) + { + return toAjax(vnaRawDataService.updateVnaRawData(vnaRawData)); + } + + /** + * 删除rf测试历史结果 + */ + @RequiresPermissions("rfMsg:vnaRawData:remove") + @Log(title = "rf测试历史结果", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(vnaRawDataService.deleteVnaRawDataByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawData.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawData.java new file mode 100644 index 00000000..f40e029e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawData.java @@ -0,0 +1,133 @@ +package com.ruoyi.rfMsg.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * rf测试历史结果对象 vna_raw_data + * + * @author ruoyi + * @date 2023-06-28 + */ +public class VnaRawData extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 时间 */ + @Excel(name = "时间") + private String date; + + /** 序列号（设备） */ + @Excel(name = "序列号", readConverterExp = "设=备") + private String serialNumber; + + /** 操作人 */ + @Excel(name = "操作人") + private String operator; + + /** 是否通过，0为NG，1为PASS */ + @Excel(name = "是否通过，0为NG，1为PASS") + private Integer status; + + /** 端口号，例：PORT1 */ + @Excel(name = "端口号，例：PORT1") + private String port; + + /** 频率 */ + private String frequency; + + /** 数值，必须对应频率 */ + private String value; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setDate(String date) + { + this.date = date; + } + + public String getDate() + { + return date; + } + public void setSerialNumber(String serialNumber) + { + this.serialNumber = serialNumber; + } + + public String getSerialNumber() + { + return serialNumber; + } + public void setOperator(String operator) + { + this.operator = operator; + } + + public String getOperator() + { + return operator; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + public void setPort(String port) + { + this.port = port; + } + + public String getPort() + { + return port; + } + public void setFrequency(String frequency) + { + this.frequency = frequency; + } + + public String getFrequency() + { + return frequency; + } + public void setValue(String value) + { + this.value = value; + } + + public String getValue() + { + return value; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("date", getDate()) + .append("serialNumber", getSerialNumber()) + .append("operator", getOperator()) + .append("status", getStatus()) + .append("port", getPort()) + .append("frequency", getFrequency()) + .append("value", getValue()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java new file mode 100644 index 00000000..66d36e23 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java @@ -0,0 +1,36 @@ +package com.ruoyi.rfMsg.domain; + +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; + +public class VnaRawDataKeyValue extends BaseEntity { + private static final long serialVersionUID = 1L; + + private String key; + + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("key", key) + .append("value", value) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/mapper/VnaRawDataMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/mapper/VnaRawDataMapper.java new file mode 100644 index 00000000..c4bf7757 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/mapper/VnaRawDataMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.rfMsg.mapper; + +import com.ruoyi.rfMsg.domain.VnaRawData; + +import java.util.List; + +/** + * rf测试历史结果Mapper接口 + * + * @author ruoyi + * @date 2023-06-28 + */ +public interface VnaRawDataMapper +{ + /** + * 查询rf测试历史结果 + * + * @param id rf测试历史结果ID + * @return rf测试历史结果 + */ + public VnaRawData selectVnaRawDataById(Long id); + + /** + * 查询rf测试历史结果列表 + * + * @param vnaRawData rf测试历史结果 + * @return rf测试历史结果集合 + */ + public List selectVnaRawDataList(VnaRawData vnaRawData); + + /** + * 新增rf测试历史结果 + * + * @param vnaRawData rf测试历史结果 + * @return 结果 + */ + public int insertVnaRawData(VnaRawData vnaRawData); + + /** + * 修改rf测试历史结果 + * + * @param vnaRawData rf测试历史结果 + * @return 结果 + */ + public int updateVnaRawData(VnaRawData vnaRawData); + + /** + * 删除rf测试历史结果 + * + * @param id rf测试历史结果ID + * @return 结果 + */ + public int deleteVnaRawDataById(Long id); + + /** + * 批量删除rf测试历史结果 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteVnaRawDataByIds(String[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/IVnaRawDataService.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/IVnaRawDataService.java new file mode 100644 index 00000000..10570fa0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/IVnaRawDataService.java @@ -0,0 +1,61 @@ +package com.ruoyi.rfMsg.service; + +import java.util.List; +import com.ruoyi.rfMsg.domain.VnaRawData; + +/** + * rf测试历史结果Service接口 + * + * @author ruoyi + * @date 2023-06-28 + */ +public interface IVnaRawDataService +{ + /** + * 查询rf测试历史结果 + * + * @param id rf测试历史结果ID + * @return rf测试历史结果 + */ + public VnaRawData selectVnaRawDataById(Long id); + + /** + * 查询rf测试历史结果列表 + * + * @param vnaRawData rf测试历史结果 + * @return rf测试历史结果集合 + */ + public List selectVnaRawDataList(VnaRawData vnaRawData); + + /** + * 新增rf测试历史结果 + * + * @param vnaRawData rf测试历史结果 + * @return 结果 + */ + public int insertVnaRawData(VnaRawData vnaRawData); + + /** + * 修改rf测试历史结果 + * + * @param vnaRawData rf测试历史结果 + * @return 结果 + */ + public int updateVnaRawData(VnaRawData vnaRawData); + + /** + * 批量删除rf测试历史结果 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteVnaRawDataByIds(String ids); + + /** + * 删除rf测试历史结果信息 + * + * @param id rf测试历史结果ID + * @return 结果 + */ + public int deleteVnaRawDataById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/impl/VnaRawDataServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/impl/VnaRawDataServiceImpl.java new file mode 100644 index 00000000..fee03c38 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/service/impl/VnaRawDataServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.rfMsg.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.rfMsg.mapper.VnaRawDataMapper; +import com.ruoyi.rfMsg.domain.VnaRawData; +import com.ruoyi.rfMsg.service.IVnaRawDataService; +import com.ruoyi.common.core.text.Convert; + +/** + * rf测试历史结果Service业务层处理 + * + * @author ruoyi + * @date 2023-06-28 + */ +@Service +public class VnaRawDataServiceImpl implements IVnaRawDataService +{ + @Autowired + private VnaRawDataMapper vnaRawDataMapper; + + /** + * 查询rf测试历史结果 + * + * @param id rf测试历史结果ID + * @return rf测试历史结果 + */ + @Override + public VnaRawData selectVnaRawDataById(Long id) + { + return vnaRawDataMapper.selectVnaRawDataById(id); + } + + /** + * 查询rf测试历史结果列表 + * + * @param vnaRawData rf测试历史结果 + * @return rf测试历史结果 + */ + @Override + public List selectVnaRawDataList(VnaRawData vnaRawData) + { + return vnaRawDataMapper.selectVnaRawDataList(vnaRawData); + } + + /** + * 新增rf测试历史结果 + * + * @param vnaRawData rf测试历史结果 + * @return 结果 + */ + @Override + public int insertVnaRawData(VnaRawData vnaRawData) + { + return vnaRawDataMapper.insertVnaRawData(vnaRawData); + } + + /** + * 修改rf测试历史结果 + * + * @param vnaRawData rf测试历史结果 + * @return 结果 + */ + @Override + public int updateVnaRawData(VnaRawData vnaRawData) + { + return vnaRawDataMapper.updateVnaRawData(vnaRawData); + } + + /** + * 删除rf测试历史结果对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteVnaRawDataByIds(String ids) + { + return vnaRawDataMapper.deleteVnaRawDataByIds(Convert.toStrArray(ids)); + } + + /** + * 删除rf测试历史结果信息 + * + * @param id rf测试历史结果ID + * @return 结果 + */ + @Override + public int deleteVnaRawDataById(Long id) + { + return vnaRawDataMapper.deleteVnaRawDataById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInspectionNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInspectionNoticeController.java index 4980bc7c..018d6cd7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInspectionNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInspectionNoticeController.java @@ -60,18 +60,40 @@ import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder. @RequestMapping("/storehouse/warehousingInspectionNotice") public class WarehousingInspectionNoticeController extends BaseController { - private String prefix = "storehouse/warehousingInspectionNotice"; + private String prefixYL = "storehouse/warehousingInspectionNoticeYL"; + private String prefixFL = "storehouse/warehousingInspectionNoticeFL"; @Autowired private IWarehousingInspectionNoticeService warehousingInspectionNoticeService; @Autowired private IWarehousingInspectionDetailService warehousingInspectionDetailService; - @RequiresPermissions("storehouse:warehousingInspectionNotice:view") - @GetMapping() - public String warehousingInspectionNotice() +// @RequiresPermissions("storehouse:warehousingInspectionNotice:view") +// @GetMapping() +// public String warehousingInspectionNotice() +// { +// return prefix + "/warehousingInspectionNotice"; +// } + + /** + * 入库检验通知单--原料 + * @return + */ + @RequiresPermissions("storehouse:warehousingInspectionNotice:viewYL") + @GetMapping("/viewYL") + public String warehousingInspectionNoticeYL() + { + return prefixYL + "/warehousingInspectionNoticeYL"; + } + /** + * 入库检验通知单--辅料 + * @return + */ + @RequiresPermissions("storehouse:warehousingInspectionNotice:viewFL") + @GetMapping("/viewFL") + public String warehousingInspectionNoticeFL() { - return prefix + "/warehousingInspectionNotice"; + return prefixFL + "/warehousingInspectionNoticeFL"; } /** @@ -86,6 +108,30 @@ public class WarehousingInspectionNoticeController extends BaseController List list = warehousingInspectionNoticeService.selectWarehousingInspectionNoticeList(warehousingInspectionNotice); return getDataTable(list); } + /** + * 查询入库检验通知列表--原料 + */ + @RequiresPermissions("storehouse:warehousingInspectionNotice:listYL") + @PostMapping("/listYL") + @ResponseBody + public TableDataInfo listYL(WarehousingInspectionNotice warehousingInspectionNotice) + { + startPage(); + List list = warehousingInspectionNoticeService.selectWarehousingInspectionNoticeYLList(warehousingInspectionNotice); + return getDataTable(list); + } + /** + * 查询入库检验通知列表--辅料 + */ + @RequiresPermissions("storehouse:warehousingInspectionNotice:listFL") + @PostMapping("/listFL") + @ResponseBody + public TableDataInfo listFL(WarehousingInspectionNotice warehousingInspectionNotice) + { + startPage(); + List list = warehousingInspectionNoticeService.selectWarehousingInspectionNoticeFLList(warehousingInspectionNotice); + return getDataTable(list); + } /** * 导出入库检验通知列表 @@ -102,12 +148,21 @@ public class WarehousingInspectionNoticeController extends BaseController } /** - * 新增入库检验通知 + * 新增入库检验通知--原料 */ - @GetMapping("/add") - public String add() + @GetMapping("/addYL") + public String addYL() { - return prefix + "/add"; + return prefixYL + "/add"; + } + + /** + * 新增入库检验通知--辅料 + */ + @GetMapping("/addFL") + public String addFL() + { + return prefixFL + "/add"; } /** @@ -123,14 +178,24 @@ public class WarehousingInspectionNoticeController extends BaseController } /** - * 修改入库检验通知 + * 修改入库检验通知--原料 */ - @GetMapping("/edit/{warehousingInspectionNoticeId}") - public String edit(@PathVariable("warehousingInspectionNoticeId") Long warehousingInspectionNoticeId, ModelMap mmap) + @GetMapping("/editYL/{warehousingInspectionNoticeId}") + public String editYL(@PathVariable("warehousingInspectionNoticeId") Long warehousingInspectionNoticeId, ModelMap mmap) { WarehousingInspectionNotice warehousingInspectionNotice = warehousingInspectionNoticeService.selectWarehousingInspectionNoticeById(warehousingInspectionNoticeId); mmap.put("warehousingInspectionNotice", warehousingInspectionNotice); - return prefix + "/edit"; + return prefixYL + "/edit"; + } + /** + * 修改入库检验通知--辅料 + */ + @GetMapping("/editFL/{warehousingInspectionNoticeId}") + public String editFL(@PathVariable("warehousingInspectionNoticeId") Long warehousingInspectionNoticeId, ModelMap mmap) + { + WarehousingInspectionNotice warehousingInspectionNotice = warehousingInspectionNoticeService.selectWarehousingInspectionNoticeById(warehousingInspectionNoticeId); + mmap.put("warehousingInspectionNotice", warehousingInspectionNotice); + return prefixFL + "/edit"; } /** @@ -157,13 +222,44 @@ public class WarehousingInspectionNoticeController extends BaseController return toAjax(warehousingInspectionNoticeService.deleteWarehousingInspectionNoticeByIds(ids)); } + @RequiresPermissions("storehouse:warehousingInspectionNotice:remove") + @Log(title = "入库检验通知", businessType = BusinessType.DELETE) + @RequestMapping( "/removeSelected") + @ResponseBody + public String removeSelected(@RequestParam(value = "ids") String ids) { + System.out.println(ids); + String[] idsStr = ids.split(","); + for (int i = 0; i< idsStr.length; i++) { + WarehousingInspectionNotice warehousingInspectionNotice = warehousingInspectionNoticeService.selectWarehousingInspectionNoticeById(Long.valueOf(idsStr[i])); + WarehousingInspectionDetail warehousingInspectionDetail = new WarehousingInspectionDetail(); + warehousingInspectionDetail.setInNoticeNumber(warehousingInspectionNotice.getInNoticeNumber()); + List list = warehousingInspectionDetailService.selectWarehousingInspectionDetailList(warehousingInspectionDetail); + if (list.size()>0) { + for (int j=0;j selectWarehousingInspectionNoticeList(WarehousingInspectionNotice warehousingInspectionNotice); + /** + * 查询入库检验通知列表 + * + * @param warehousingInspectionNotice 入库检验通知--原料 + * @return 入库检验通知集合 + */ + public List selectWarehousingInspectionNoticeYLList(WarehousingInspectionNotice warehousingInspectionNotice); + /** + * 查询入库检验通知列表 + * + * @param warehousingInspectionNotice 入库检验通知--辅料 + * @return 入库检验通知集合 + */ + public List selectWarehousingInspectionNoticeFLList(WarehousingInspectionNotice warehousingInspectionNotice); /** * 新增入库检验通知 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInspectionNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInspectionNoticeService.java index d02510ad..ba9d8ff5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInspectionNoticeService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInspectionNoticeService.java @@ -28,6 +28,22 @@ public interface IWarehousingInspectionNoticeService */ public List selectWarehousingInspectionNoticeList(WarehousingInspectionNotice warehousingInspectionNotice); + /** + * 查询入库检验通知列表 + * + * @param warehousingInspectionNotice 入库检验通知--原料 + * @return 入库检验通知集合 + */ + public List selectWarehousingInspectionNoticeYLList(WarehousingInspectionNotice warehousingInspectionNotice); + + /** + * 查询入库检验通知列表 + * + * @param warehousingInspectionNotice 入库检验通知--辅料 + * @return 入库检验通知集合 + */ + public List selectWarehousingInspectionNoticeFLList(WarehousingInspectionNotice warehousingInspectionNotice); + /** * 新增入库检验通知 * @@ -60,5 +76,6 @@ public interface IWarehousingInspectionNoticeService */ public int deleteWarehousingInspectionNoticeById(Long warehousingInspectionNoticeId); - public String getId(); + public String getIdYL(); + public String getIdFL(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java index 499bf376..5d43a086 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java @@ -45,6 +45,28 @@ public class WarehousingInspectionNoticeServiceImpl implements IWarehousingInspe { return warehousingInspectionNoticeMapper.selectWarehousingInspectionNoticeList(warehousingInspectionNotice); } + /** + * 查询入库检验通知列表 + * + * @param warehousingInspectionNotice 入库检验通知--原料 + * @return 入库检验通知 + */ + @Override + public List selectWarehousingInspectionNoticeYLList(WarehousingInspectionNotice warehousingInspectionNotice) + { + return warehousingInspectionNoticeMapper.selectWarehousingInspectionNoticeYLList(warehousingInspectionNotice); + } + /** + * 查询入库检验通知列表 + * + * @param warehousingInspectionNotice 入库检验通知--辅料 + * @return 入库检验通知 + */ + @Override + public List selectWarehousingInspectionNoticeFLList(WarehousingInspectionNotice warehousingInspectionNotice) + { + return warehousingInspectionNoticeMapper.selectWarehousingInspectionNoticeFLList(warehousingInspectionNotice); + } /** * 新增入库检验通知 @@ -95,7 +117,12 @@ public class WarehousingInspectionNoticeServiceImpl implements IWarehousingInspe } @Override - public String getId() { + public String getIdYL() { + String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); + return "IQC" + time; + } + @Override + public String getIdFL() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); return "PQCFL" + time; } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index c8aba6c9..6c012f5a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: false # 文件路径 示例（ Windows配置c:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: C:/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false diff --git a/ruoyi-admin/src/main/resources/mapper/rfMsg/VnaRawDataMapper.xml b/ruoyi-admin/src/main/resources/mapper/rfMsg/VnaRawDataMapper.xml new file mode 100644 index 00000000..2f0abb45 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/rfMsg/VnaRawDataMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + select id, Date, Serial_Number, Operator, Status, Port, Frequency, Value from vna_raw_data + + + + + + + + insert into vna_raw_data + + Date, + Serial_Number, + Operator, + Status, + Port, + Frequency, + Value, + + + #{date}, + #{serialNumber}, + #{operator}, + #{status}, + #{port}, + #{frequency}, + #{value}, + + + + + update vna_raw_data + + Date = #{date}, + Serial_Number = #{serialNumber}, + Operator = #{operator}, + Status = #{status}, + Port = #{port}, + Frequency = #{frequency}, + Value = #{value}, + + where id = #{id} + + + + delete from vna_raw_data where id = #{id} + + + + delete from vna_raw_data where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInspectionNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInspectionNoticeMapper.xml index ea0c3de8..9a33c981 100644 --- a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInspectionNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInspectionNoticeMapper.xml @@ -44,6 +44,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and warehousing_date between #{params.beginWarehousingDate} and #{params.endWarehousingDate} + + diff --git a/ruoyi-admin/src/main/resources/templates/outsource/materialRequisitionOutsource/edit.html b/ruoyi-admin/src/main/resources/templates/outsource/materialRequisitionOutsource/edit.html index 5778b4b1..2c021322 100644 --- a/ruoyi-admin/src/main/resources/templates/outsource/materialRequisitionOutsource/edit.html +++ b/ruoyi-admin/src/main/resources/templates/outsource/materialRequisitionOutsource/edit.html @@ -113,7 +113,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/outsource/materialRequisitionOutsource/materialRequisitionOutsource.html b/ruoyi-admin/src/main/resources/templates/outsource/materialRequisitionOutsource/materialRequisitionOutsource.html index 57e8d3e3..4a34cc57 100644 --- a/ruoyi-admin/src/main/resources/templates/outsource/materialRequisitionOutsource/materialRequisitionOutsource.html +++ b/ruoyi-admin/src/main/resources/templates/outsource/materialRequisitionOutsource/materialRequisitionOutsource.html @@ -44,9 +44,9 @@
  • - + - - +
  • @@ -158,7 +158,7 @@ }, { field: 'outputDate', - title: '出库日期' + title: '出库时间' }, { field: 'remarkContent', diff --git a/ruoyi-admin/src/main/resources/templates/outsource/outsourceInspectionNotice/add.html b/ruoyi-admin/src/main/resources/templates/outsource/outsourceInspectionNotice/add.html index e8b29944..f13ed56d 100644 --- a/ruoyi-admin/src/main/resources/templates/outsource/outsourceInspectionNotice/add.html +++ b/ruoyi-admin/src/main/resources/templates/outsource/outsourceInspectionNotice/add.html @@ -64,13 +64,19 @@
    - + +
    - + +
    @@ -94,13 +100,19 @@
    - + +
    - + +
    @@ -121,7 +133,10 @@
    - + +
    @@ -154,6 +169,7 @@ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/edit.html b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/edit.html new file mode 100644 index 00000000..69239cf3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/edit.html @@ -0,0 +1,70 @@ + + + + + + + +
    +
    + +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html new file mode 100644 index 00000000..986dbe57 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html @@ -0,0 +1,171 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + + - + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + +
    + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNotice/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNotice/add.html index b9e0d139..7bd676fc 100644 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNotice/add.html +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNotice/add.html @@ -215,7 +215,7 @@ //获取单号 $.ajax({ - url: prefix + "/getId", + url: prefix + "/getIdFL", type: "post", dateType: "json", success: function (resp) { diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/add.html new file mode 100644 index 00000000..27f89c4f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/add.html @@ -0,0 +1,548 @@ + + + + + + + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    + + + + + + + + + +
    + +
    + +
    +
    + + + + + + + + + + +
    +
    +
    +
    +
    +

    订单材料信息

    +
    +
    +
    +
    +
    + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/edit.html new file mode 100644 index 00000000..38b45a8d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/edit.html @@ -0,0 +1,535 @@ + + + + + + + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    + + + + + + + + + +
    + +
    + +
    +
    + + + + + + + + + +
    +
    +
    +
    +
    +

    订单材料信息

    +
    +
    +
    +
    +
    + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/warehousingInspectionNoticeFL.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/warehousingInspectionNoticeFL.html new file mode 100644 index 00000000..b28a520e --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeFL/warehousingInspectionNoticeFL.html @@ -0,0 +1,394 @@ + + + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • + + + + + + +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/add.html new file mode 100644 index 00000000..97734142 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/add.html @@ -0,0 +1,547 @@ + + + + + + + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    + + + + + + + + + +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +

    订单材料信息

    +
    +
    +
    +
    +
    + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/edit.html new file mode 100644 index 00000000..c9a85f3d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/edit.html @@ -0,0 +1,534 @@ + + + + + + + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    + + + + + + + + + +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +

    订单材料信息

    +
    +
    +
    +
    +
    + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/warehousingInspectionNoticeYL.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/warehousingInspectionNoticeYL.html new file mode 100644 index 00000000..e2614a69 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInspectionNoticeYL/warehousingInspectionNoticeYL.html @@ -0,0 +1,394 @@ + + + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • + + + + + + +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + + + + \ No newline at end of file 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 cf1fadc8..eeb3687c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/bom/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/bom/add.html @@ -1177,12 +1177,31 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // console.log(value.length) + if (value.slice(value.length-1, value.length) == '%') { + // console.log(value) + var number = value.slice(0, value.length-1) + if(isNaN(number)) { + return '使用量必须是数字'; + } + if (parseFloat(number) <= 0) { + return '使用量必须大于0'; + } + } else { + return '请在末尾添加%' + } + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; + } + }, + formatter: (value, row, index) => { + if (value == null || value =='') { + var loss = '0%' + row.rawMaterialLoss = loss + return loss } } - }, { field: 'supplierNumber', @@ -1716,12 +1735,31 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // console.log(value.length) + if (value.slice(value.length-1, value.length) == '%') { + // console.log(value) + var number = value.slice(0, value.length-1) + if(isNaN(number)) { + return '使用量必须是数字'; + } + if (parseFloat(number) <= 0) { + return '使用量必须大于0'; + } + } else { + return '请在末尾添加%' + } + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; + } + }, + formatter: (value, row, index) => { + if (value == null || value =='') { + var loss = '0%' + row.subsidiaryMaterialLoss = loss + return loss } } - }, { field: 'supplierNumber', @@ -2189,12 +2227,31 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // console.log(value.length) + if (value.slice(value.length-1, value.length) == '%') { + // console.log(value) + var number = value.slice(0, value.length-1) + if(isNaN(number)) { + return '使用量必须是数字'; + } + if (parseFloat(number) <= 0) { + return '使用量必须大于0'; + } + } else { + return '请在末尾添加%' + } + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; + } + }, + formatter: (value, row, index) => { + if (value == null || value =='') { + var loss = '0%' + row.bcpMaterialLoss = loss + return loss } } - }, { field: 'customerNumber', diff --git a/ruoyi-admin/src/main/resources/templates/system/bom/edit.html b/ruoyi-admin/src/main/resources/templates/system/bom/edit.html index a1c4cdc9..449d7783 100644 --- a/ruoyi-admin/src/main/resources/templates/system/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/bom/edit.html @@ -456,6 +456,7 @@ var getData = [[${sysBom}]]; var finishProductCode = ''; var finishProductCode = getData.finishProductCode + var versionNumber = getData.versionNumber var prefix = ctx + "system/bom"; var prefixfinishproduct = ctx + "system/finishproduct" @@ -787,7 +788,7 @@ // 原料表格数据 $('#addrowbomTable').bootstrapTable({ - url: "/system/bomrawmaterial/getFinishCode", + url: "/system/bomrawmaterial/list", pagination: true, pageNumber: 1, pageSize: 10, @@ -814,7 +815,8 @@ // 传递参数查询参数 pageSize: params.limit, pageNum: params.offset / params.limit + 1, - finishProductCode: finishProductCode + finishProductCode: finishProductCode, + versionNumber: versionNumber }; console.log($("input[name='finishProductCode']").val()) @@ -863,12 +865,34 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { + // console.log(value.length) + if (value.slice(value.length-1, value.length) == '%') { + // console.log(value) + var number = value.slice(0, value.length-1) + if(isNaN(number)) { + return '使用量必须是数字'; + } + if (parseFloat(number) <= 0) { + return '使用量必须大于0'; + } + } else { + return '请在末尾添加%' + } // if (isNaN(value)) return '使用量必须是数字'; // var price = parseFloat(value); // if (price <= 0) return '使用量必须大于0'; } + }, + formatter: (value, row, index) => { + if (value == null || value =='') { + var loss = '0%' + row.rawMaterialLoss = loss + return loss + } else { + row.rawMaterialLoss = value + return value + } } - }, { field: 'supplierNumber', @@ -927,7 +951,7 @@ // 辅料 $('#addsubsidiarybomTable').bootstrapTable({ - url: "/system/bomsubsidiarymaterial/getFinishCode", + url: "/system/bomsubsidiarymaterial/list", pagination: true, pageNumber: 1, pageSize: 10, @@ -954,7 +978,8 @@ // 传递参数查询参数 pageSize: params.limit, pageNum: params.offset / params.limit + 1, - finishProductCode: finishProductCode + finishProductCode: finishProductCode, + versionNumber: versionNumber }; console.log($("input[name='finishProductCode']").val()) @@ -1002,12 +1027,34 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { + // console.log(value.length) + if (value.slice(value.length-1, value.length) == '%') { + // console.log(value) + var number = value.slice(0, value.length-1) + if(isNaN(number)) { + return '使用量必须是数字'; + } + if (parseFloat(number) <= 0) { + return '使用量必须大于0'; + } + } else { + return '请在末尾添加%' + } // if (isNaN(value)) return '使用量必须是数字'; // var price = parseFloat(value); // if (price <= 0) return '使用量必须大于0'; } + }, + formatter: (value, row, index) => { + if (value == null || value =='') { + var loss = '0%' + row.subsidiaryMaterialLoss = loss + return loss + } else { + row.subsidiaryMaterialLoss = value + return value + } } - }, { field: 'supplierNumber', @@ -2077,7 +2124,7 @@ pageSize: params.limit, pageNum: params.offset / params.limit + 1, finishProductCode: finishProductCode, - versionNumber: getData.versionNumber + versionNumber: versionNumber }; // console.log(data[0].enterpriseCode) @@ -2146,12 +2193,35 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { + // console.log(value.length) + if (value.slice(value.length-1, value.length) == '%') { + // console.log(value) + var number = value.slice(0, value.length-1) + if(isNaN(number)) { + return '使用量必须是数字'; + } + if (parseFloat(number) <= 0) { + return '使用量必须大于0'; + } + } else { + return '请在末尾添加%' + } // if (isNaN(value)) return '使用量必须是数字'; // var price = parseFloat(value); // if (price <= 0) return '使用量必须大于0'; } + }, + formatter: (value, row, index) => { + if (value == null || value =='') { + var loss = '0%' + row.bcpMaterialLoss = loss + return loss + } else { + row.bcpMaterialLoss = value + return value + } + // console.log(value) } - }, { field: 'customerNumber', diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/edit.html b/ruoyi-admin/src/main/resources/templates/system/procedure/edit.html index 439fdb47..9bfa7da2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/procedure/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/procedure/edit.html @@ -71,6 +71,8 @@