root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[feat] 委外加工 

删除项目的老的委外模块相关代码
更新相关联的模块调用老委外的代码
dev
liuxiaoxu 4 months ago
parent
1d0638a298
commit
ecc32ed116
23 changed files with 757 additions and 4080 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1516
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.java
  2. 292
      ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceInspectionNoticeController.java
  3. 285
      ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceOrderInfoController.java
  4. 166
      ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceOrderMaterialController.java
  5. 405
      ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceInspectionNotice.java
  6. 425
      ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceOrderInfo.java
  7. 237
      ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceOrderMaterial.java
  8. 62
      ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceInspectionNoticeMapper.java
  9. 64
      ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceOrderInfoMapper.java
  10. 61
      ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceOrderMaterialMapper.java
  11. 77
      ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceProcessMapper.java
  12. 64
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceInspectionNoticeService.java
  13. 64
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceOrderInfoService.java
  14. 61
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceOrderMaterialService.java
  15. 77
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceProcessService.java
  16. 102
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceInspectionNoticeServiceImpl.java
  17. 102
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderInfoServiceImpl.java
  18. 94
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderMaterialServiceImpl.java
  19. 141
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceProcessServiceImpl.java
  20. 165
      ruoyi-admin/src/main/resources/mapper/outsource/OutsourceInspectionNoticeMapper.xml
  21. 169
      ruoyi-admin/src/main/resources/mapper/outsource/OutsourceOrderInfoMapper.xml
  22. 113
      ruoyi-admin/src/main/resources/mapper/outsource/OutsourceOrderMaterialMapper.xml
  23. 95
      ruoyi-admin/src/main/resources/mapper/outsource/OutsourceProcessMapper.xml

1516
ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.java
View File

File diff suppressed because it is too large

292
ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceInspectionNoticeController.java
View File

@ -1,292 +0,0 @@
package com.ruoyi.outsource.controller;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.util.MapUtils;
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.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.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.outsource.domain.OutsourceInspectionNotice;
import com.ruoyi.outsource.domain.exportDto.OutsourceInspectionNoticeDto;
import com.ruoyi.outsource.service.IOutsourceInspectionNoticeService;
import com.ruoyi.purchase.domain.exportDto.PurchaseMaterialDto;
import com.ruoyi.storehouse.domain.WarehousingInspectionDetail;
import com.ruoyi.storehouse.domain.exportDto.WarehousingInspectionDetailDto;
import com.ruoyi.storehouse.service.IWarehousingInspectionDetailService;
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log;
/**
* 委外加工入库检验通知Controller
*
* @author ruoyi
* @date 2023-05-09
*/
@Controller
@RequestMapping("/outsource/outsourceInspectionNotice")
public class OutsourceInspectionNoticeController extends BaseController
{
private String prefix = "outsource/outsourceInspectionNotice";
/**
* excel数据量
*/
private Integer excelSize = 8;
@Autowired
private IOutsourceInspectionNoticeService outsourceInspectionNoticeService;
@Autowired
private IWarehousingInspectionDetailService warehousingInspectionDetailService;
@RequiresPermissions("outsource:outsourceInspectionNotice:view")
@GetMapping()
public String outsourceInspectionNotice()
{
return prefix + "/outsourceInspectionNotice";
}
/**
* 查询委外加工入库检验通知列表
*/
@RequiresPermissions("outsource:outsourceInspectionNotice:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OutsourceInspectionNotice outsourceInspectionNotice)
{
startPage();
List<OutsourceInspectionNotice> list = outsourceInspectionNoticeService.selectOutsourceInspectionNoticeList(outsourceInspectionNotice);
return getDataTable(list);
}
/**
* 导出委外加工入库检验通知列表
*/
@RequiresPermissions("outsource:outsourceInspectionNotice:export")
@Log(title = "委外加工入库检验通知", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OutsourceInspectionNotice outsourceInspectionNotice)
{
List<OutsourceInspectionNotice> list = outsourceInspectionNoticeService.selectOutsourceInspectionNoticeList(outsourceInspectionNotice);
ExcelUtil<OutsourceInspectionNotice> util = new ExcelUtil<OutsourceInspectionNotice>(OutsourceInspectionNotice.class);
return util.exportExcel(list, "委外加工入库检验通知数据");
}
/**
* 新增委外加工入库检验通知
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存委外加工入库检验通知
*/
@RequiresPermissions("outsource:outsourceInspectionNotice:add")
@Log(title = "委外加工入库检验通知", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(OutsourceInspectionNotice outsourceInspectionNotice)
{
return toAjax(outsourceInspectionNoticeService.insertOutsourceInspectionNotice(outsourceInspectionNotice));
}
/**
* 修改委外加工入库检验通知
*/
@GetMapping("/edit/{warehousingInspectionNoticeId}")
public String edit(@PathVariable("warehousingInspectionNoticeId") Long warehousingInspectionNoticeId, ModelMap mmap)
{
OutsourceInspectionNotice outsourceInspectionNotice = outsourceInspectionNoticeService.selectOutsourceInspectionNoticeById(warehousingInspectionNoticeId);
mmap.put("outsourceInspectionNotice", outsourceInspectionNotice);
return prefix + "/edit";
}
/**
* 修改保存委外加工入库检验通知
*/
@RequiresPermissions("outsource:outsourceInspectionNotice:edit")
@Log(title = "委外加工入库检验通知", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(OutsourceInspectionNotice outsourceInspectionNotice)
{
return toAjax(outsourceInspectionNoticeService.updateOutsourceInspectionNotice(outsourceInspectionNotice));
}
/**
* 删除委外加工入库检验通知
*/
@RequiresPermissions("outsource:outsourceInspectionNotice:remove")
@Log(title = "委外加工入库检验通知", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(outsourceInspectionNoticeService.deleteOutsourceInspectionNoticeByIds(ids));
}
/**
* 获取订单id
*/
@PostMapping("/getId")
@ResponseBody
public Result getId() throws Exception {
return Result.getSuccessResult(outsourceInspectionNoticeService.getId());
}
@RequiresPermissions("outsource:outsourceInspectionNotice: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++) {
OutsourceInspectionNotice outsourceInspectionNotice = outsourceInspectionNoticeService.selectOutsourceInspectionNoticeById(Long.valueOf(idsStr[i]));
WarehousingInspectionDetail warehousingInDetail = new WarehousingInspectionDetail();
warehousingInDetail.setInNoticeNumber(outsourceInspectionNotice.getInNoticeNumber());
List<WarehousingInspectionDetail> list = warehousingInspectionDetailService.selectWarehousingInspectionDetailList(warehousingInDetail);
if (list.size()>0) {
for (int j=0;j<list.size();j++) {
warehousingInspectionDetailService.deleteWarehousingInspectionDetailById(list.get(j).getWarehousingInspectionDetailId());
}
}
}
outsourceInspectionNoticeService.deleteOutsourceInspectionNoticeByIds(ids);
return "操作成功！";
}
@RequiresPermissions("outsource:outsourceInspectionNotice:export")
@Log(title = "入库检验通知", businessType = BusinessType.EXPORT)
@RequestMapping("/exportSelected/{warehousingInspectionNoticeId}")
@ResponseBody
public void exportSelected(@PathVariable("warehousingInspectionNoticeId") Long warehousingInspectionNoticeId, HttpServletResponse response) throws IOException {
//
//单号信息
System.out.println(warehousingInspectionNoticeId);
OutsourceInspectionNotice outsourceInspectionNotice = outsourceInspectionNoticeService.selectOutsourceInspectionNoticeById(warehousingInspectionNoticeId);
OutsourceInspectionNoticeDto outsourceInspectionNoticeDto = new OutsourceInspectionNoticeDto();
BeanUtils.copyProperties(outsourceInspectionNotice,outsourceInspectionNoticeDto);
//物料信息
WarehousingInspectionDetail warehousingInspectionDetail = new WarehousingInspectionDetail();
warehousingInspectionDetail.setInNoticeNumber(outsourceInspectionNotice.getInNoticeNumber());
// 创建列合并工具类对象
ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils();
List<WarehousingInspectionDetail> detailList = warehousingInspectionDetailService.selectWarehousingInspectionDetailList(warehousingInspectionDetail);
List<WarehousingInspectionDetailDto> detailDtoList = new ArrayList<>();
try {
int number = 0;
Iterator values= detailList.iterator();
while(values.hasNext()) {
Object source = values.next();
WarehousingInspectionDetailDto target = WarehousingInspectionDetailDto.class.newInstance();
BeanUtils.copyProperties(source, target);
// mergePrevColUtils.add(number+6,1,1);
target.setNumber(++number);
target.setProcedureName(outsourceInspectionNoticeDto.getProcedureName());
detailDtoList.add(target);
}
int size = detailDtoList.size();
if (detailDtoList.size()<excelSize) {
int excelMinus = excelSize-size;
for (int i =0;i<excelMinus;i++) {
WarehousingInspectionDetailDto warehousingInspectionDetailDto = new WarehousingInspectionDetailDto();
warehousingInspectionDetailDto.setNumber(++number);
warehousingInspectionDetailDto.setMaterialCode("");
warehousingInspectionDetailDto.setMaterialName("");
warehousingInspectionDetailDto.setSpecificationModel("");
warehousingInspectionDetailDto.setTypeMachine("");
warehousingInspectionDetailDto.setProductionOrderNumber("");
warehousingInspectionDetailDto.setQualifiedQuantity("");
warehousingInspectionDetailDto.setProductionOrderNumber("");
warehousingInspectionDetailDto.setMaterialQuantity("");
warehousingInspectionDetailDto.setProcedureName("");
detailDtoList.add(warehousingInspectionDetailDto);
}
}
}catch (Exception e) {
log.error(">>>>>>异常<<<<<<", e);
}
System.out.println(detailDtoList);
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("委外入库检验通知单", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
String templateFileName = "C:\\exportTemplates\\exportOutsourceInspectionNotice.xlsx";
try (ExcelWriter excelWriter = EasyExcel
.write(response.getOutputStream(), PurchaseMaterialDto.class)
.withTemplate(templateFileName)
// .registerWriteHandler(mergePrevColUtils)
//样式注册
.registerWriteHandler(horizontalCellStyleStrategyBuilder())
.build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
excelWriter.fill(detailDtoList, fillConfig, writeSheet);
Map<String, Object> map = MapUtils.newHashMap();
// map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now()));
map.put("supplierName", outsourceInspectionNoticeDto.getSupplierName());
map.put("inspectionDate", outsourceInspectionNoticeDto.getInspectionDate().substring(0,10));
excelWriter.fill(map, writeSheet);
}
}
public CellStyleStrategy horizontalCellStyleStrategyBuilder() {
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
//设置头字体
WriteFont headWriteFont = new WriteFont();
// headWriteFont.setFontHeightInPoints((short) 13);
// headWriteFont.setBold(true);
headWriteCellStyle.setWriteFont(headWriteFont);
//设置头居中
headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
//内容策略
WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
//设置 水平居中
contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
//垂直居中
contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
//单元格边框
contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
return new CellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
}
}

285
ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceOrderInfoController.java
View File

@ -1,285 +0,0 @@
package com.ruoyi.outsource.controller;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.util.MapUtils;
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.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.fastjson.JSONObject;
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.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.outsource.domain.OutsourceOrderInfo;
import com.ruoyi.outsource.domain.OutsourceOrderMaterial;
import com.ruoyi.outsource.domain.exportDto.OutsourceOrderInfoDto;
import com.ruoyi.outsource.domain.exportDto.OutsourceOrderMaterialDto;
import com.ruoyi.outsource.service.IOutsourceOrderInfoService;
import com.ruoyi.outsource.service.IOutsourceOrderMaterialService;
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log;
/**
* 委外加工订单Controller
*
* @author ruoyi
* @date 2023-04-17
*/
@Controller
@RequestMapping("/outsource/outsourceOrderInfo")
public class OutsourceOrderInfoController extends BaseController
{
private String prefix = "outsource/outsourceOrderInfo";
@Autowired
private IOutsourceOrderInfoService outsourceOrderInfoService;
@Autowired
private IOutsourceOrderMaterialService outsourceOrderMaterialService;
@RequiresPermissions("outsource:outsourceOrderInfo:view")
@GetMapping()
public String outsourceOrderInfo()
{
return prefix + "/outsourceOrderInfo";
}
/**
* 查询委外加工订单列表
*/
@RequiresPermissions("outsource:outsourceOrderInfo:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OutsourceOrderInfo outsourceOrderInfo)
{
startPage();
List<OutsourceOrderInfo> list = outsourceOrderInfoService.selectOutsourceOrderInfoList(outsourceOrderInfo);
return getDataTable(list);
}
/**
* 导出委外加工订单列表
*/
@RequiresPermissions("outsource:outsourceOrderInfo:export")
@Log(title = "委外加工订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OutsourceOrderInfo outsourceOrderInfo)
{
List<OutsourceOrderInfo> list = outsourceOrderInfoService.selectOutsourceOrderInfoList(outsourceOrderInfo);
ExcelUtil<OutsourceOrderInfo> util = new ExcelUtil<OutsourceOrderInfo>(OutsourceOrderInfo.class);
return util.exportExcel(list, "委外加工订单数据");
}
/**
* 新增委外加工订单
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存委外加工订单
*/
@RequiresPermissions("outsource:outsourceOrderInfo:add")
@Log(title = "委外加工订单", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(OutsourceOrderInfo outsourceOrderInfo)
{
return toAjax(outsourceOrderInfoService.insertOutsourceOrderInfo(outsourceOrderInfo));
}
/**
* 修改委外加工订单
*/
@GetMapping("/edit/{outsourceOrderId}")
public String edit(@PathVariable("outsourceOrderId") Long outsourceOrderId, ModelMap mmap)
{
OutsourceOrderInfo outsourceOrderInfo = outsourceOrderInfoService.selectOutsourceOrderInfoById(outsourceOrderId);
mmap.put("outsourceOrderInfo", outsourceOrderInfo);
return prefix + "/edit";
}
/**
* 修改保存委外加工订单
*/
@RequiresPermissions("outsource:outsourceOrderInfo:edit")
@Log(title = "委外加工订单", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(OutsourceOrderInfo outsourceOrderInfo)
{
return toAjax(outsourceOrderInfoService.updateOutsourceOrderInfo(outsourceOrderInfo));
}
/**
* 删除委外加工订单
*/
@RequiresPermissions("outsource:outsourceOrderInfo:remove")
@Log(title = "委外加工订单", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(outsourceOrderInfoService.deleteOutsourceOrderInfoByIds(ids));
}
@RequiresPermissions("outsource:outsourceOrderInfo:remove")
@Log(title = "委外加工订单", businessType = BusinessType.DELETE)
@RequestMapping( "/removeSelectedOrder")
@ResponseBody
public String removeSelectedOrder(@RequestParam(value = "orderData") String orderData) {
// System.out.println(orderData);
List<OutsourceOrderInfo> outsourceOrderInfoList = JSONObject.parseArray(orderData, OutsourceOrderInfo.class);
OutsourceOrderInfo outsourceOrderInfo = outsourceOrderInfoService.selectOutsourceOrderInfoById(outsourceOrderInfoList.get(0).getOutsourceOrderId());
System.out.println(outsourceOrderInfo);
OutsourceOrderMaterial outsourceOrderMaterial = new OutsourceOrderMaterial();
outsourceOrderMaterial.setOutsourceOrderNumber(outsourceOrderInfo.getOutsourceOrderNumber());
List<OutsourceOrderMaterial> outsourceOrderMaterialList = outsourceOrderMaterialService.selectOutsourceOrderMaterialList(outsourceOrderMaterial);
if (outsourceOrderMaterialList.size()>0) {
for (int i=0;i<outsourceOrderMaterialList.size();i++) {
outsourceOrderMaterialService.deleteOutsourceOrderMaterialById(outsourceOrderMaterialList.get(i).getOutsourceOrderMaterialId());
}
outsourceOrderInfoService.deleteOutsourceOrderInfoById(outsourceOrderInfoList.get(0).getOutsourceOrderId());
} else {
outsourceOrderInfoService.deleteOutsourceOrderInfoById(outsourceOrderInfoList.get(0).getOutsourceOrderId());
}
return "操作成功！";
}
/**
* 委外加工订单导出
* @param outsourceOrderId
* @param response
* @throws IOException
*/
@RequiresPermissions("outsource:outsourceOrderInfo:export")
@Log(title = "委外加工订单", businessType = BusinessType.EXPORT)
@RequestMapping("/exportSelected/{outsourceOrderId}")
@ResponseBody
public void exportSelected(@PathVariable("outsourceOrderId") Long outsourceOrderId, HttpServletResponse response) throws IOException {
//
System.out.println(outsourceOrderId);
OutsourceOrderInfo outsourceOrderInfo = outsourceOrderInfoService.selectOutsourceOrderInfoById(outsourceOrderId);
OutsourceOrderInfoDto outsourceOrderInfoDto = new OutsourceOrderInfoDto();
BeanUtils.copyProperties(outsourceOrderInfo,outsourceOrderInfoDto);
OutsourceOrderMaterial outsourceOrderMaterial = new OutsourceOrderMaterial();
outsourceOrderMaterial.setOutsourceOrderNumber(outsourceOrderInfo.getOutsourceOrderNumber());
// 创建列合并工具类对象
ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils();
List<OutsourceOrderMaterial> outsourceOrderMaterialList = outsourceOrderMaterialService.selectOutsourceOrderMaterialList(outsourceOrderMaterial);
List<OutsourceOrderMaterialDto> outsourceOrderMaterialDtoList = new ArrayList<>();
double total = 0.00;
try {
int number = 0;
Iterator values= outsourceOrderMaterialList.iterator();
while(values.hasNext()) {
Object source = values.next();
OutsourceOrderMaterialDto target = OutsourceOrderMaterialDto.class.newInstance();
BeanUtils.copyProperties(source, target);
mergePrevColUtils.add(number+12,1,1);
mergePrevColUtils.add(number+12,7,1);
target.setNumber(++number);
outsourceOrderMaterialDtoList.add(target);
total = total + Double.parseDouble(target.getProcessFee());
}
}catch (Exception e) {
log.error(">>>>>>异常<<<<<<", e);
}
System.out.println(outsourceOrderMaterialDtoList);
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("委外加工订单", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
String templateFileName = "C:\\exportTemplates\\exportOutsourceOrder.xlsx";
try (ExcelWriter excelWriter = EasyExcel
.write(response.getOutputStream(), OutsourceOrderMaterialDto.class)
.withTemplate(templateFileName)
.registerWriteHandler(mergePrevColUtils)
//样式注册
.registerWriteHandler(horizontalCellStyleStrategyBuilder())
.build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
excelWriter.fill(outsourceOrderMaterialDtoList, fillConfig, writeSheet);
Map<String, Object> map = MapUtils.newHashMap();
// map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now()));
map.put("outsourceOrderNumber", outsourceOrderInfoDto.getOutsourceOrderNumber());
map.put("billingTime", outsourceOrderInfoDto.getBillingTime());
map.put("supplierName", outsourceOrderInfoDto.getSupplierName());
map.put("supplierCode", outsourceOrderInfoDto.getSupplierCode());
map.put("contactNumber", outsourceOrderInfoDto.getContactNumber());
map.put("customerFax", outsourceOrderInfoDto.getCustomerFax());
map.put("customerContact", outsourceOrderInfoDto.getCustomerContact());
map.put("total", total);
excelWriter.fill(map, writeSheet);
}
}
public HorizontalCellStyleStrategy horizontalCellStyleStrategyBuilder() {
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
//设置头字体
WriteFont headWriteFont = new WriteFont();
headWriteFont.setFontHeightInPoints((short) 13);
headWriteFont.setBold(true);
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.setBorderBottom(BorderStyle.DASHED);
return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
}
/**
* 获取报价编号
*/
@PostMapping("/getId")
@ResponseBody
public Result getId() throws Exception {
return Result.getSuccessResult(outsourceOrderInfoService.getId());
}
}

166
ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceOrderMaterialController.java
View File

@ -1,166 +0,0 @@
package com.ruoyi.outsource.controller;
import com.alibaba.fastjson.JSONObject;
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.outsource.domain.OutsourceOrderMaterial;
import com.ruoyi.outsource.service.IOutsourceOrderMaterialService;
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.Arrays;
import java.util.List;
import java.util.Objects;
import static com.ruoyi.common.core.domain.AjaxResult.Type.SUCCESS;
/**
* 委外加工订单物料Controller
*
* @author ruoyi
* @date 2023-04-18
*/
@Controller
@RequestMapping("/outsource/outsourceOrderMaterial")
public class OutsourceOrderMaterialController extends BaseController
{
private String prefix = "outsource/outsourceOrderMaterial";
@Autowired
private IOutsourceOrderMaterialService outsourceOrderMaterialService;
@RequiresPermissions("outsource:outsourceOrderMaterial:view")
@GetMapping()
public String outsourceOrderMaterial()
{
return prefix + "/outsourceOrderMaterial";
}
/**
* 查询委外加工订单物料列表
*/
@RequiresPermissions("outsource:outsourceOrderMaterial:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OutsourceOrderMaterial outsourceOrderMaterial)
{
startPage();
List<OutsourceOrderMaterial> list = outsourceOrderMaterialService.selectOutsourceOrderMaterialList(outsourceOrderMaterial);
return getDataTable(list);
}
/**
* 导出委外加工订单物料列表
*/
@RequiresPermissions("outsource:outsourceOrderMaterial:export")
@Log(title = "委外加工订单物料", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OutsourceOrderMaterial outsourceOrderMaterial)
{
List<OutsourceOrderMaterial> list = outsourceOrderMaterialService.selectOutsourceOrderMaterialList(outsourceOrderMaterial);
ExcelUtil<OutsourceOrderMaterial> util = new ExcelUtil<OutsourceOrderMaterial>(OutsourceOrderMaterial.class);
return util.exportExcel(list, "委外加工订单物料数据");
}
/**
* 新增委外加工订单物料
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存委外加工订单物料
*/
@RequiresPermissions("outsource:outsourceOrderMaterial:add")
@Log(title = "委外加工订单物料", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(OutsourceOrderMaterial outsourceOrderMaterial)
{
return toAjax(outsourceOrderMaterialService.insertOutsourceOrderMaterial(outsourceOrderMaterial));
}
/**
* 修改委外加工订单物料
*/
@GetMapping("/edit/{outsourceOrderMaterialId}")
public String edit(@PathVariable("outsourceOrderMaterialId") Long outsourceOrderMaterialId, ModelMap mmap)
{
OutsourceOrderMaterial outsourceOrderMaterial = outsourceOrderMaterialService.selectOutsourceOrderMaterialById(outsourceOrderMaterialId);
mmap.put("outsourceOrderMaterial", outsourceOrderMaterial);
return prefix + "/edit";
}
/**
* 修改保存委外加工订单物料
*/
@RequiresPermissions("outsource:outsourceOrderMaterial:edit")
@Log(title = "委外加工订单物料", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(OutsourceOrderMaterial outsourceOrderMaterial)
{
return toAjax(outsourceOrderMaterialService.updateOutsourceOrderMaterial(outsourceOrderMaterial));
}
/**
* 删除委外加工订单物料
*/
@RequiresPermissions("outsource:outsourceOrderMaterial:remove")
@Log(title = "委外加工订单物料", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(outsourceOrderMaterialService.deleteOutsourceOrderMaterialByIds(ids));
}
@PostMapping("/addEditSave")
@ResponseBody
public AjaxResult addEditSave(@RequestParam(value = "data") String data)
{
// 反序列化
List<OutsourceOrderMaterial> outsourceOrderMaterialList = JSONObject.parseArray(data, OutsourceOrderMaterial.class);
for (int i=0;i<outsourceOrderMaterialList.size();i++) {
String id = String.valueOf(outsourceOrderMaterialService.selectOutsourceOrderMaterialById(outsourceOrderMaterialList.get(i).getOutsourceOrderMaterialId()));
if (Objects.equals(id, "null")) {
outsourceOrderMaterialService.insertOutsourceOrderMaterial(outsourceOrderMaterialList.get(i));
} else {
outsourceOrderMaterialService.updateOutsourceOrderMaterial(outsourceOrderMaterialList.get(i));
}
}
return new AjaxResult(SUCCESS, "test done");
}
//删除
@PostMapping("/removeMaterial")
@ResponseBody
public AjaxResult removeMaterial(@RequestParam(value = "ids") String ids) {
// System.out.println(ids);
ids=ids.replace("[","").replace("]","");
List<String> idList = Arrays.asList(ids.split(","));
for (int i=0;i<idList.size();i++) {
if (!("null".equals(idList.get(i)))) {
outsourceOrderMaterialService.deleteOutsourceOrderMaterialById(Long.valueOf(idList.get(i)));
}
}
return new AjaxResult(SUCCESS, "test done");
}
}

405
ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceInspectionNotice.java
View File

@ -1,405 +0,0 @@
package com.ruoyi.outsource.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;
/**
* 委外加工入库检验通知对象 warehousing_inspection_notice
*
* @author ruoyi
* @date 2023-05-09
*/
public class OutsourceInspectionNotice extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 入库检验通知id */
private Long warehousingInspectionNoticeId;
/** 入通知单号 */
@Excel(name = "入通知单号")
private String inNoticeNumber;
/** 订购单号 */
private String purchaseOrderNumber;
/** 委外订单单号 */
@Excel(name = "委外订单单号")
private String outsourceOrderNumber;
/** 厂商代码 */
@Excel(name = "厂商代码")
private String supplierCode;
/** 厂商名称 */
@Excel(name = "厂商名称")
private String supplierName;
/** 联系人 */
private String customerContact;
/** 仓库编号 */
@Excel(name = "仓库编号")
private String stockNumber;
/** 仓库名称 */
@Excel(name = "仓库名称")
private String stockName;
/** 仓库管理员 */
private String stockManager;
/** 内外销 */
private String exportSales;
/** 入库类别 */
private String warehousingCategory;
/** 交检日期 */
@Excel(name = "交检日期")
private String inspectionDate;
/** 入库日期 */
@Excel(name = "入库日期")
private String warehousingDate;
/** 备注 */
@Excel(name = "备注")
private String remarks;
/** 检验报告 */
private String inspectionReport;
/** 录入时间 */
@Excel(name = "录入时间")
private String firstAddTime;
/** 修改时间 */
@Excel(name = "修改时间")
private String updateInfoTime;
/** 加工工序编号 */
@Excel(name = "加工工序编号")
private String procedureCode;
/** 加工工序名称 */
@Excel(name = "加工工序名称")
private String procedureName;
/** 备用一 */
private String standbyOne;
/** 备用二 */
private String standbyTwo;
/** 接收人员 */
@Excel(name = "接收人员")
private String receivingPersonnel;
/** 录入人员 */
@Excel(name = "录入人员")
private String entryPersonnel;
/** 加工类型 */
@Excel(name = "加工类型")
private String processingType;
/** 确认否 */
@Excel(name = "确认否")
private String confirmFlag;
/** 确认人 */
private String confirmPerson;
/** 确认时间 */
private String confirmTime;
public void setWarehousingInspectionNoticeId(Long warehousingInspectionNoticeId)
{
this.warehousingInspectionNoticeId = warehousingInspectionNoticeId;
}
public Long getWarehousingInspectionNoticeId()
{
return warehousingInspectionNoticeId;
}
public void setInNoticeNumber(String inNoticeNumber)
{
this.inNoticeNumber = inNoticeNumber;
}
public String getInNoticeNumber()
{
return inNoticeNumber;
}
public void setPurchaseOrderNumber(String purchaseOrderNumber)
{
this.purchaseOrderNumber = purchaseOrderNumber;
}
public String getPurchaseOrderNumber()
{
return purchaseOrderNumber;
}
public void setOutsourceOrderNumber(String outsourceOrderNumber)
{
this.outsourceOrderNumber = outsourceOrderNumber;
}
public String getOutsourceOrderNumber()
{
return outsourceOrderNumber;
}
public void setSupplierCode(String supplierCode)
{
this.supplierCode = supplierCode;
}
public String getSupplierCode()
{
return supplierCode;
}
public void setSupplierName(String supplierName)
{
this.supplierName = supplierName;
}
public String getSupplierName()
{
return supplierName;
}
public void setCustomerContact(String customerContact)
{
this.customerContact = customerContact;
}
public String getCustomerContact()
{
return customerContact;
}
public void setStockNumber(String stockNumber)
{
this.stockNumber = stockNumber;
}
public String getStockNumber()
{
return stockNumber;
}
public void setStockName(String stockName)
{
this.stockName = stockName;
}
public String getStockName()
{
return stockName;
}
public void setStockManager(String stockManager)
{
this.stockManager = stockManager;
}
public String getStockManager()
{
return stockManager;
}
public void setExportSales(String exportSales)
{
this.exportSales = exportSales;
}
public String getExportSales()
{
return exportSales;
}
public void setWarehousingCategory(String warehousingCategory)
{
this.warehousingCategory = warehousingCategory;
}
public String getWarehousingCategory()
{
return warehousingCategory;
}
public void setInspectionDate(String inspectionDate)
{
this.inspectionDate = inspectionDate;
}
public String getInspectionDate()
{
return inspectionDate;
}
public void setWarehousingDate(String warehousingDate)
{
this.warehousingDate = warehousingDate;
}
public String getWarehousingDate()
{
return warehousingDate;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
public void setInspectionReport(String inspectionReport)
{
this.inspectionReport = inspectionReport;
}
public String getInspectionReport()
{
return inspectionReport;
}
public void setFirstAddTime(String firstAddTime)
{
this.firstAddTime = firstAddTime;
}
public String getFirstAddTime()
{
return firstAddTime;
}
public void setUpdateInfoTime(String updateInfoTime)
{
this.updateInfoTime = updateInfoTime;
}
public String getUpdateInfoTime()
{
return updateInfoTime;
}
public void setProcedureCode(String procedureCode)
{
this.procedureCode = procedureCode;
}
public String getProcedureCode()
{
return procedureCode;
}
public void setProcedureName(String procedureName)
{
this.procedureName = procedureName;
}
public String getProcedureName()
{
return procedureName;
}
public void setStandbyOne(String standbyOne)
{
this.standbyOne = standbyOne;
}
public String getStandbyOne()
{
return standbyOne;
}
public void setStandbyTwo(String standbyTwo)
{
this.standbyTwo = standbyTwo;
}
public String getStandbyTwo()
{
return standbyTwo;
}
public void setReceivingPersonnel(String receivingPersonnel)
{
this.receivingPersonnel = receivingPersonnel;
}
public String getReceivingPersonnel()
{
return receivingPersonnel;
}
public void setEntryPersonnel(String entryPersonnel)
{
this.entryPersonnel = entryPersonnel;
}
public String getEntryPersonnel()
{
return entryPersonnel;
}
public void setProcessingType(String processingType)
{
this.processingType = processingType;
}
public String getProcessingType()
{
return processingType;
}
public void setConfirmFlag(String confirmFlag)
{
this.confirmFlag = confirmFlag;
}
public String getConfirmFlag()
{
return confirmFlag;
}
public void setConfirmPerson(String confirmPerson)
{
this.confirmPerson = confirmPerson;
}
public String getConfirmPerson()
{
return confirmPerson;
}
public void setConfirmTime(String confirmTime)
{
this.confirmTime = confirmTime;
}
public String getConfirmTime()
{
return confirmTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("warehousingInspectionNoticeId", getWarehousingInspectionNoticeId())
.append("inNoticeNumber", getInNoticeNumber())
.append("purchaseOrderNumber", getPurchaseOrderNumber())
.append("outsourceOrderNumber", getOutsourceOrderNumber())
.append("supplierCode", getSupplierCode())
.append("supplierName", getSupplierName())
.append("customerContact", getCustomerContact())
.append("stockNumber", getStockNumber())
.append("stockName", getStockName())
.append("stockManager", getStockManager())
.append("exportSales", getExportSales())
.append("warehousingCategory", getWarehousingCategory())
.append("inspectionDate", getInspectionDate())
.append("warehousingDate", getWarehousingDate())
.append("remarks", getRemarks())
.append("inspectionReport", getInspectionReport())
.append("firstAddTime", getFirstAddTime())
.append("updateInfoTime", getUpdateInfoTime())
.append("procedureCode", getProcedureCode())
.append("procedureName", getProcedureName())
.append("standbyOne", getStandbyOne())
.append("standbyTwo", getStandbyTwo())
.append("receivingPersonnel", getReceivingPersonnel())
.append("entryPersonnel", getEntryPersonnel())
.append("processingType", getProcessingType())
.append("confirmFlag", getConfirmFlag())
.append("confirmPerson", getConfirmPerson())
.append("confirmTime", getConfirmTime())
.toString();
}
}

425
ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceOrderInfo.java
View File

@ -1,425 +0,0 @@
package com.ruoyi.outsource.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;
/**
* 委外加工订单对象 outsource_order_info
*
* @author ruoyi
* @date 2023-04-17
*/
public class OutsourceOrderInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 委外订单id */
private Long outsourceOrderId;
/** 委外订单单号 */
@Excel(name = "委外订单单号")
private String outsourceOrderNumber;
/** 委外加工批号 */
@Excel(name = "委外加工批号")
private String outsourceBatchNumber;
/** 厂商编号 */
@Excel(name = "厂商编号")
private String supplierCode;
/** 厂商名称 */
@Excel(name = "厂商名称")
private String supplierName;
/** 主联系人 */
@Excel(name = "主联系人")
private String customerContact;
/** 联系电话 */
@Excel(name = "联系电话")
private String contactNumber;
/** 传真 */
@Excel(name = "传真")
private String customerFax;
/** 企业地址 */
@Excel(name = "企业地址")
private String customerAddress;
/** 交货时间 */
@Excel(name = "交货时间")
private String deliveryTime;
/** 加工工序编号 */
@Excel(name = "加工工序编号")
private String procedureCode;
/** 加工工序名称 */
@Excel(name = "加工工序名称")
private String procedureName;
/** 发出仓库编号 */
@Excel(name = "发出仓库编号")
private String issueStockNumber;
/** 发出仓库名称 */
@Excel(name = "发出仓库名称")
private String issueStockName;
/** 交货仓库编号 */
@Excel(name = "交货仓库编号")
private String deliveryStockNumber;
/** 交货仓库名称 */
@Excel(name = "交货仓库名称")
private String deliveryStockName;
/** 开单时间 */
@Excel(name = "开单时间")
private String billingTime;
/** 备注内容 */
@Excel(name = "备注内容")
private String remarks;
/** 承运公司 */
@Excel(name = "承运公司")
private String carrierCompany;
/** 确认否 */
@Excel(name = "确认否")
private String confirmFlag;
/** 确认人 */
@Excel(name = "确认人")
private String confirmPerson;
/** 确认时间 */
@Excel(name = "确认时间")
private String confirmTime;
/** 结案否 */
@Excel(name = "结案否")
private String closeCaseFlag;
/** 结案人 */
@Excel(name = "结案人")
private String closeCasePerson;
/** 结案时间 */
@Excel(name = "结案时间")
private String closeCaseTime;
/** 录入时间 */
private String firstAddTime;
/** 修改时间 */
private String updateInfoTime;
/** 备用一 */
private String standbyOne;
/** 备用二 */
private String standbyTwo;
public void setOutsourceOrderId(Long outsourceOrderId)
{
this.outsourceOrderId = outsourceOrderId;
}
public Long getOutsourceOrderId()
{
return outsourceOrderId;
}
public void setOutsourceOrderNumber(String outsourceOrderNumber)
{
this.outsourceOrderNumber = outsourceOrderNumber;
}
public String getOutsourceOrderNumber()
{
return outsourceOrderNumber;
}
public void setOutsourceBatchNumber(String outsourceBatchNumber)
{
this.outsourceBatchNumber = outsourceBatchNumber;
}
public String getOutsourceBatchNumber()
{
return outsourceBatchNumber;
}
public void setSupplierCode(String supplierCode)
{
this.supplierCode = supplierCode;
}
public String getSupplierCode()
{
return supplierCode;
}
public void setSupplierName(String supplierName)
{
this.supplierName = supplierName;
}
public String getSupplierName()
{
return supplierName;
}
public void setCustomerContact(String customerContact)
{
this.customerContact = customerContact;
}
public String getCustomerContact()
{
return customerContact;
}
public void setContactNumber(String contactNumber)
{
this.contactNumber = contactNumber;
}
public String getContactNumber()
{
return contactNumber;
}
public void setCustomerFax(String customerFax)
{
this.customerFax = customerFax;
}
public String getCustomerFax()
{
return customerFax;
}
public void setCustomerAddress(String customerAddress)
{
this.customerAddress = customerAddress;
}
public String getCustomerAddress()
{
return customerAddress;
}
public void setDeliveryTime(String deliveryTime)
{
this.deliveryTime = deliveryTime;
}
public String getDeliveryTime()
{
return deliveryTime;
}
public void setProcedureCode(String procedureCode)
{
this.procedureCode = procedureCode;
}
public String getProcedureCode()
{
return procedureCode;
}
public void setProcedureName(String procedureName)
{
this.procedureName = procedureName;
}
public String getProcedureName()
{
return procedureName;
}
public void setIssueStockNumber(String issueStockNumber)
{
this.issueStockNumber = issueStockNumber;
}
public String getIssueStockNumber()
{
return issueStockNumber;
}
public void setIssueStockName(String issueStockName)
{
this.issueStockName = issueStockName;
}
public String getIssueStockName()
{
return issueStockName;
}
public void setDeliveryStockNumber(String deliveryStockNumber)
{
this.deliveryStockNumber = deliveryStockNumber;
}
public String getDeliveryStockNumber()
{
return deliveryStockNumber;
}
public void setDeliveryStockName(String deliveryStockName)
{
this.deliveryStockName = deliveryStockName;
}
public String getDeliveryStockName()
{
return deliveryStockName;
}
public void setBillingTime(String billingTime)
{
this.billingTime = billingTime;
}
public String getBillingTime()
{
return billingTime;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
public void setCarrierCompany(String carrierCompany)
{
this.carrierCompany = carrierCompany;
}
public String getCarrierCompany()
{
return carrierCompany;
}
public void setConfirmFlag(String confirmFlag)
{
this.confirmFlag = confirmFlag;
}
public String getConfirmFlag()
{
return confirmFlag;
}
public void setConfirmPerson(String confirmPerson)
{
this.confirmPerson = confirmPerson;
}
public String getConfirmPerson()
{
return confirmPerson;
}
public void setConfirmTime(String confirmTime)
{
this.confirmTime = confirmTime;
}
public String getConfirmTime()
{
return confirmTime;
}
public void setCloseCaseFlag(String closeCaseFlag)
{
this.closeCaseFlag = closeCaseFlag;
}
public String getCloseCaseFlag()
{
return closeCaseFlag;
}
public void setCloseCasePerson(String closeCasePerson)
{
this.closeCasePerson = closeCasePerson;
}
public String getCloseCasePerson()
{
return closeCasePerson;
}
public void setCloseCaseTime(String closeCaseTime)
{
this.closeCaseTime = closeCaseTime;
}
public String getCloseCaseTime()
{
return closeCaseTime;
}
public void setFirstAddTime(String firstAddTime)
{
this.firstAddTime = firstAddTime;
}
public String getFirstAddTime()
{
return firstAddTime;
}
public void setUpdateInfoTime(String updateInfoTime)
{
this.updateInfoTime = updateInfoTime;
}
public String getUpdateInfoTime()
{
return updateInfoTime;
}
public void setStandbyOne(String standbyOne)
{
this.standbyOne = standbyOne;
}
public String getStandbyOne()
{
return standbyOne;
}
public void setStandbyTwo(String standbyTwo)
{
this.standbyTwo = standbyTwo;
}
public String getStandbyTwo()
{
return standbyTwo;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("outsourceOrderId", getOutsourceOrderId())
.append("outsourceOrderNumber", getOutsourceOrderNumber())
.append("outsourceBatchNumber", getOutsourceBatchNumber())
.append("supplierCode", getSupplierCode())
.append("supplierName", getSupplierName())
.append("customerContact", getCustomerContact())
.append("contactNumber", getContactNumber())
.append("customerFax", getCustomerFax())
.append("customerAddress", getCustomerAddress())
.append("deliveryTime", getDeliveryTime())
.append("procedureCode", getProcedureCode())
.append("procedureName", getProcedureName())
.append("issueStockNumber", getIssueStockNumber())
.append("issueStockName", getIssueStockName())
.append("deliveryStockNumber", getDeliveryStockNumber())
.append("deliveryStockName", getDeliveryStockName())
.append("billingTime", getBillingTime())
.append("remarks", getRemarks())
.append("carrierCompany", getCarrierCompany())
.append("confirmFlag", getConfirmFlag())
.append("confirmPerson", getConfirmPerson())
.append("confirmTime", getConfirmTime())
.append("closeCaseFlag", getCloseCaseFlag())
.append("closeCasePerson", getCloseCasePerson())
.append("closeCaseTime", getCloseCaseTime())
.append("firstAddTime", getFirstAddTime())
.append("updateInfoTime", getUpdateInfoTime())
.append("standbyOne", getStandbyOne())
.append("standbyTwo", getStandbyTwo())
.toString();
}
}

237
ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceOrderMaterial.java
View File

@ -1,237 +0,0 @@
package com.ruoyi.outsource.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;
/**
* 委外加工订单物料对象 outsource_order_material
*
* @author ruoyi
* @date 2023-04-18
*/
public class OutsourceOrderMaterial extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 委外加工物料id */
private Long outsourceOrderMaterialId;
/** 委外加工订单单号 */
@Excel(name = "委外加工订单单号")
private String outsourceOrderNumber;
/** 工单号 */
@Excel(name = "工单号")
private String outsourceWorkNumber;
/** 物料代码 */
@Excel(name = "物料代码")
private String materialCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 规格型号 */
@Excel(name = "规格型号")
private String specificationModel;
/** 物料类别 */
@Excel(name = "物料类别")
private String materialType;
/** 单位 */
@Excel(name = "单位")
private String inventoryUnit;
/** 数量 */
@Excel(name = "数量")
private String quantity;
/** 加工单价 */
@Excel(name = "加工单价")
private String processPrice;
/** 加工费 */
@Excel(name = "加工费")
private String processFee;
/** 交期 */
@Excel(name = "交期")
private String deliveryDate;
/** 说明 */
@Excel(name = "说明")
private String description;
/** 备用一 */
private String standbyOne;
/** 备用二 */
private String standbyTwo;
public OutsourceOrderMaterial() {
}
public OutsourceOrderMaterial(String outsourceOrderNumber) {
this.outsourceOrderNumber = outsourceOrderNumber;
}
public void setOutsourceOrderMaterialId(Long outsourceOrderMaterialId)
{
this.outsourceOrderMaterialId = outsourceOrderMaterialId;
}
public Long getOutsourceOrderMaterialId()
{
return outsourceOrderMaterialId;
}
public void setOutsourceOrderNumber(String outsourceOrderNumber)
{
this.outsourceOrderNumber = outsourceOrderNumber;
}
public String getOutsourceWorkNumber() {
return outsourceWorkNumber;
}
public void setOutsourceWorkNumber(String outsourceWorkNumber) {
this.outsourceWorkNumber = outsourceWorkNumber;
}
public String getOutsourceOrderNumber()
{
return outsourceOrderNumber;
}
public void setMaterialCode(String materialCode)
{
this.materialCode = materialCode;
}
public String getMaterialCode()
{
return materialCode;
}
public void setMaterialName(String materialName)
{
this.materialName = materialName;
}
public String getMaterialName()
{
return materialName;
}
public void setSpecificationModel(String specificationModel)
{
this.specificationModel = specificationModel;
}
public String getSpecificationModel()
{
return specificationModel;
}
public void setMaterialType(String materialType)
{
this.materialType = materialType;
}
public String getMaterialType()
{
return materialType;
}
public void setInventoryUnit(String inventoryUnit)
{
this.inventoryUnit = inventoryUnit;
}
public String getInventoryUnit()
{
return inventoryUnit;
}
public void setQuantity(String quantity)
{
this.quantity = quantity;
}
public String getQuantity()
{
return quantity;
}
public void setProcessPrice(String processPrice)
{
this.processPrice = processPrice;
}
public String getProcessPrice()
{
return processPrice;
}
public void setProcessFee(String processFee)
{
this.processFee = processFee;
}
public String getProcessFee()
{
return processFee;
}
public void setDeliveryDate(String deliveryDate)
{
this.deliveryDate = deliveryDate;
}
public String getDeliveryDate()
{
return deliveryDate;
}
public void setDescription(String description)
{
this.description = description;
}
public String getDescription()
{
return description;
}
public void setStandbyOne(String standbyOne)
{
this.standbyOne = standbyOne;
}
public String getStandbyOne()
{
return standbyOne;
}
public void setStandbyTwo(String standbyTwo)
{
this.standbyTwo = standbyTwo;
}
public String getStandbyTwo()
{
return standbyTwo;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("outsourceOrderMaterialId", getOutsourceOrderMaterialId())
.append("outsourceOrderNumber", getOutsourceOrderNumber())
.append("outsourceWorkNumber", getOutsourceWorkNumber())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("specificationModel", getSpecificationModel())
.append("materialType", getMaterialType())
.append("inventoryUnit", getInventoryUnit())
.append("quantity", getQuantity())
.append("processPrice", getProcessPrice())
.append("processFee", getProcessFee())
.append("deliveryDate", getDeliveryDate())
.append("description", getDescription())
.append("standbyOne", getStandbyOne())
.append("standbyTwo", getStandbyTwo())
.toString();
}
}

62
ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceInspectionNoticeMapper.java
View File

@ -1,62 +0,0 @@
package com.ruoyi.outsource.mapper;
import com.ruoyi.outsource.domain.OutsourceInspectionNotice;
import java.util.List;
/**
* 委外加工入库检验通知Mapper接口
*
* @author ruoyi
* @date 2023-05-09
*/
public interface OutsourceInspectionNoticeMapper
{
/**
* 查询委外加工入库检验通知
*
* @param warehousingInspectionNoticeId 委外加工入库检验通知ID
* @return 委外加工入库检验通知
*/
public OutsourceInspectionNotice selectOutsourceInspectionNoticeById(Long warehousingInspectionNoticeId);
/**
* 查询委外加工入库检验通知列表
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 委外加工入库检验通知集合
*/
public List<OutsourceInspectionNotice> selectOutsourceInspectionNoticeList(OutsourceInspectionNotice outsourceInspectionNotice);
/**
* 新增委外加工入库检验通知
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 结果
*/
public int insertOutsourceInspectionNotice(OutsourceInspectionNotice outsourceInspectionNotice);
/**
* 修改委外加工入库检验通知
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 结果
*/
public int updateOutsourceInspectionNotice(OutsourceInspectionNotice outsourceInspectionNotice);
/**
* 删除委外加工入库检验通知
*
* @param warehousingInspectionNoticeId 委外加工入库检验通知ID
* @return 结果
*/
public int deleteOutsourceInspectionNoticeById(Long warehousingInspectionNoticeId);
/**
* 批量删除委外加工入库检验通知
*
* @param warehousingInspectionNoticeIds 需要删除的数据ID
* @return 结果
*/
public int deleteOutsourceInspectionNoticeByIds(String[] warehousingInspectionNoticeIds);
}

64
ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceOrderInfoMapper.java
View File

@ -1,64 +0,0 @@
package com.ruoyi.outsource.mapper;
import com.ruoyi.outsource.domain.OutsourceOrderInfo;
import java.util.List;
/**
* 委外加工订单Mapper接口
*
* @author ruoyi
* @date 2023-04-17
*/
public interface OutsourceOrderInfoMapper
{
/**
* 查询委外加工订单
*
* @param outsourceOrderId 委外加工订单ID
* @return 委外加工订单
*/
public OutsourceOrderInfo selectOutsourceOrderInfoById(Long outsourceOrderId);
/**
* 查询委外加工订单列表
*
* @param outsourceOrderInfo 委外加工订单
* @return 委外加工订单集合
*/
public List<OutsourceOrderInfo> selectOutsourceOrderInfoList(OutsourceOrderInfo outsourceOrderInfo);
/**
* 新增委外加工订单
*
* @param outsourceOrderInfo 委外加工订单
* @return 结果
*/
public int insertOutsourceOrderInfo(OutsourceOrderInfo outsourceOrderInfo);
/**
* 修改委外加工订单
*
* @param outsourceOrderInfo 委外加工订单
* @return 结果
*/
public int updateOutsourceOrderInfo(OutsourceOrderInfo outsourceOrderInfo);
/**
* 删除委外加工订单
*
* @param outsourceOrderId 委外加工订单ID
* @return 结果
*/
public int deleteOutsourceOrderInfoById(Long outsourceOrderId);
/**
* 批量删除委外加工订单
*
* @param outsourceOrderIds 需要删除的数据ID
* @return 结果
*/
public int deleteOutsourceOrderInfoByIds(String[] outsourceOrderIds);
public List<OutsourceOrderInfo> selectByIdDesc();
}

61
ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceOrderMaterialMapper.java
View File

@ -1,61 +0,0 @@
package com.ruoyi.outsource.mapper;
import java.util.List;
import com.ruoyi.outsource.domain.OutsourceOrderMaterial;
/**
* 委外加工订单物料Mapper接口
*
* @author ruoyi
* @date 2023-04-18
*/
public interface OutsourceOrderMaterialMapper
{
/**
* 查询委外加工订单物料
*
* @param outsourceOrderMaterialId 委外加工订单物料ID
* @return 委外加工订单物料
*/
public OutsourceOrderMaterial selectOutsourceOrderMaterialById(Long outsourceOrderMaterialId);
/**
* 查询委外加工订单物料列表
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 委外加工订单物料集合
*/
public List<OutsourceOrderMaterial> selectOutsourceOrderMaterialList(OutsourceOrderMaterial outsourceOrderMaterial);
/**
* 新增委外加工订单物料
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 结果
*/
public int insertOutsourceOrderMaterial(OutsourceOrderMaterial outsourceOrderMaterial);
/**
* 修改委外加工订单物料
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 结果
*/
public int updateOutsourceOrderMaterial(OutsourceOrderMaterial outsourceOrderMaterial);
/**
* 删除委外加工订单物料
*
* @param outsourceOrderMaterialId 委外加工订单物料ID
* @return 结果
*/
public int deleteOutsourceOrderMaterialById(Long outsourceOrderMaterialId);
/**
* 批量删除委外加工订单物料
*
* @param outsourceOrderMaterialIds 需要删除的数据ID
* @return 结果
*/
public int deleteOutsourceOrderMaterialByIds(String[] outsourceOrderMaterialIds);
}

77
ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceProcessMapper.java
View File

@ -1,77 +0,0 @@
package com.ruoyi.outsource.mapper;
import java.util.List;
import com.ruoyi.outsource.domain.OutsourceProcess;
/**
* 委外工序列表Mapper接口
*
* @author zhang
* @date 2024-03-08
*/
public interface OutsourceProcessMapper
{
/**
* 查询委外工序列表
*
* @param outsourceProcessId 委外工序列表ID
* @return 委外工序列表
*/
public OutsourceProcess selectOutsourceProcessById(String outsourceProcessId);
/**
* 查询委外工序列表列表
*
* @param outsourceProcess 委外工序列表
* @return 委外工序列表集合
*/
public List<OutsourceProcess> selectOutsourceProcessList(OutsourceProcess outsourceProcess);
/**
* 新增委外工序列表
*
* @param outsourceProcess 委外工序列表
* @return 结果
*/
public int insertOutsourceProcess(OutsourceProcess outsourceProcess);
/**
* 修改委外工序列表
*
* @param outsourceProcess 委外工序列表
* @return 结果
*/
public int updateOutsourceProcess(OutsourceProcess outsourceProcess);
/**
* 删除委外工序列表
*
* @param outsourceProcessId 委外工序列表ID
* @return 结果
*/
public int deleteOutsourceProcessById(String outsourceProcessId);
/**
* 批量删除委外工序列表
*
* @param outsourceProcessIds 需要删除的数据ID
* @return 结果
*/
public int deleteOutsourceProcessByIds(String[] outsourceProcessIds);
/**
* 作废委外工序列表
*
* @param outsourceProcessId 委外工序列表ID
* @return 结果
*/
public int cancelOutsourceProcessById(String outsourceProcessId);
/**
* 恢复委外工序列表
*
* @param outsourceProcessId 委外工序列表ID
* @return 结果
*/
public int restoreOutsourceProcessById(String outsourceProcessId);
}

64
ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceInspectionNoticeService.java
View File

@ -1,64 +0,0 @@
package com.ruoyi.outsource.service;
import com.ruoyi.outsource.domain.OutsourceInspectionNotice;
import java.util.List;
/**
* 委外加工入库检验通知Service接口
*
* @author ruoyi
* @date 2023-05-09
*/
public interface IOutsourceInspectionNoticeService
{
/**
* 查询委外加工入库检验通知
*
* @param warehousingInspectionNoticeId 委外加工入库检验通知ID
* @return 委外加工入库检验通知
*/
public OutsourceInspectionNotice selectOutsourceInspectionNoticeById(Long warehousingInspectionNoticeId);
/**
* 查询委外加工入库检验通知列表
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 委外加工入库检验通知集合
*/
public List<OutsourceInspectionNotice> selectOutsourceInspectionNoticeList(OutsourceInspectionNotice outsourceInspectionNotice);
/**
* 新增委外加工入库检验通知
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 结果
*/
public int insertOutsourceInspectionNotice(OutsourceInspectionNotice outsourceInspectionNotice);
/**
* 修改委外加工入库检验通知
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 结果
*/
public int updateOutsourceInspectionNotice(OutsourceInspectionNotice outsourceInspectionNotice);
/**
* 批量删除委外加工入库检验通知
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteOutsourceInspectionNoticeByIds(String ids);
/**
* 删除委外加工入库检验通知信息
*
* @param warehousingInspectionNoticeId 委外加工入库检验通知ID
* @return 结果
*/
public int deleteOutsourceInspectionNoticeById(Long warehousingInspectionNoticeId);
public String getId();
}

64
ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceOrderInfoService.java
View File

@ -1,64 +0,0 @@
package com.ruoyi.outsource.service;
import com.ruoyi.outsource.domain.OutsourceOrderInfo;
import java.util.List;
/**
* 委外加工订单Service接口
*
* @author ruoyi
* @date 2023-04-17
*/
public interface IOutsourceOrderInfoService
{
/**
* 查询委外加工订单
*
* @param outsourceOrderId 委外加工订单ID
* @return 委外加工订单
*/
public OutsourceOrderInfo selectOutsourceOrderInfoById(Long outsourceOrderId);
/**
* 查询委外加工订单列表
*
* @param outsourceOrderInfo 委外加工订单
* @return 委外加工订单集合
*/
public List<OutsourceOrderInfo> selectOutsourceOrderInfoList(OutsourceOrderInfo outsourceOrderInfo);
/**
* 新增委外加工订单
*
* @param outsourceOrderInfo 委外加工订单
* @return 结果
*/
public int insertOutsourceOrderInfo(OutsourceOrderInfo outsourceOrderInfo);
/**
* 修改委外加工订单
*
* @param outsourceOrderInfo 委外加工订单
* @return 结果
*/
public int updateOutsourceOrderInfo(OutsourceOrderInfo outsourceOrderInfo);
/**
* 批量删除委外加工订单
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteOutsourceOrderInfoByIds(String ids);
/**
* 删除委外加工订单信息
*
* @param outsourceOrderId 委外加工订单ID
* @return 结果
*/
public int deleteOutsourceOrderInfoById(Long outsourceOrderId);
public String getId();
}

61
ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceOrderMaterialService.java
View File

@ -1,61 +0,0 @@
package com.ruoyi.outsource.service;
import java.util.List;
import com.ruoyi.outsource.domain.OutsourceOrderMaterial;
/**
* 委外加工订单物料Service接口
*
* @author ruoyi
* @date 2023-04-18
*/
public interface IOutsourceOrderMaterialService
{
/**
* 查询委外加工订单物料
*
* @param outsourceOrderMaterialId 委外加工订单物料ID
* @return 委外加工订单物料
*/
public OutsourceOrderMaterial selectOutsourceOrderMaterialById(Long outsourceOrderMaterialId);
/**
* 查询委外加工订单物料列表
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 委外加工订单物料集合
*/
public List<OutsourceOrderMaterial> selectOutsourceOrderMaterialList(OutsourceOrderMaterial outsourceOrderMaterial);
/**
* 新增委外加工订单物料
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 结果
*/
public int insertOutsourceOrderMaterial(OutsourceOrderMaterial outsourceOrderMaterial);
/**
* 修改委外加工订单物料
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 结果
*/
public int updateOutsourceOrderMaterial(OutsourceOrderMaterial outsourceOrderMaterial);
/**
* 批量删除委外加工订单物料
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteOutsourceOrderMaterialByIds(String ids);
/**
* 删除委外加工订单物料信息
*
* @param outsourceOrderMaterialId 委外加工订单物料ID
* @return 结果
*/
public int deleteOutsourceOrderMaterialById(Long outsourceOrderMaterialId);
}

77
ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceProcessService.java
View File

@ -1,77 +0,0 @@
package com.ruoyi.outsource.service;
import java.util.List;
import com.ruoyi.outsource.domain.OutsourceProcess;
/**
* 委外工序列表Service接口
*
* @author zhang
* @date 2024-03-08
*/
public interface IOutsourceProcessService
{
/**
* 查询委外工序列表
*
* @param outsourceProcessId 委外工序列表ID
* @return 委外工序列表
*/
public OutsourceProcess selectOutsourceProcessById(String outsourceProcessId);
/**
* 查询委外工序列表列表
*
* @param outsourceProcess 委外工序列表
* @return 委外工序列表集合
*/
public List<OutsourceProcess> selectOutsourceProcessList(OutsourceProcess outsourceProcess);
/**
* 新增委外工序列表
*
* @param outsourceProcess 委外工序列表
* @return 结果
*/
public int insertOutsourceProcess(OutsourceProcess outsourceProcess);
/**
* 修改委外工序列表
*
* @param outsourceProcess 委外工序列表
* @return 结果
*/
public int updateOutsourceProcess(OutsourceProcess outsourceProcess);
/**
* 批量删除委外工序列表
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteOutsourceProcessByIds(String ids);
/**
* 删除委外工序列表信息
*
* @param outsourceProcessId 委外工序列表ID
* @return 结果
*/
public int deleteOutsourceProcessById(String outsourceProcessId);
/**
* 作废委外工序列表
* @param outsourceProcessId 委外工序列表ID
* @return
*/
int cancelOutsourceProcessById(String outsourceProcessId);
/**
* 恢复委外工序列表
* @param outsourceProcessId 委外工序列表ID
* @return
*/
int restoreOutsourceProcessById(String outsourceProcessId);
Object getId();
}

102
ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceInspectionNoticeServiceImpl.java
View File

@ -1,102 +0,0 @@
package com.ruoyi.outsource.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.outsource.domain.OutsourceInspectionNotice;
import com.ruoyi.outsource.mapper.OutsourceInspectionNoticeMapper;
import com.ruoyi.outsource.service.IOutsourceInspectionNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.List;
/**
* 委外加工入库检验通知Service业务层处理
*
* @author ruoyi
* @date 2023-05-09
*/
@Service
public class OutsourceInspectionNoticeServiceImpl implements IOutsourceInspectionNoticeService
{
@Autowired
private OutsourceInspectionNoticeMapper outsourceInspectionNoticeMapper;
/**
* 查询委外加工入库检验通知
*
* @param warehousingInspectionNoticeId 委外加工入库检验通知ID
* @return 委外加工入库检验通知
*/
@Override
public OutsourceInspectionNotice selectOutsourceInspectionNoticeById(Long warehousingInspectionNoticeId)
{
return outsourceInspectionNoticeMapper.selectOutsourceInspectionNoticeById(warehousingInspectionNoticeId);
}
/**
* 查询委外加工入库检验通知列表
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 委外加工入库检验通知
*/
@Override
public List<OutsourceInspectionNotice> selectOutsourceInspectionNoticeList(OutsourceInspectionNotice outsourceInspectionNotice)
{
return outsourceInspectionNoticeMapper.selectOutsourceInspectionNoticeList(outsourceInspectionNotice);
}
/**
* 新增委外加工入库检验通知
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 结果
*/
@Override
public int insertOutsourceInspectionNotice(OutsourceInspectionNotice outsourceInspectionNotice)
{
return outsourceInspectionNoticeMapper.insertOutsourceInspectionNotice(outsourceInspectionNotice);
}
/**
* 修改委外加工入库检验通知
*
* @param outsourceInspectionNotice 委外加工入库检验通知
* @return 结果
*/
@Override
public int updateOutsourceInspectionNotice(OutsourceInspectionNotice outsourceInspectionNotice)
{
return outsourceInspectionNoticeMapper.updateOutsourceInspectionNotice(outsourceInspectionNotice);
}
/**
* 删除委外加工入库检验通知对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteOutsourceInspectionNoticeByIds(String ids)
{
return outsourceInspectionNoticeMapper.deleteOutsourceInspectionNoticeByIds(Convert.toStrArray(ids));
}
/**
* 删除委外加工入库检验通知信息
*
* @param warehousingInspectionNoticeId 委外加工入库检验通知ID
* @return 结果
*/
@Override
public int deleteOutsourceInspectionNoticeById(Long warehousingInspectionNoticeId)
{
return outsourceInspectionNoticeMapper.deleteOutsourceInspectionNoticeById(warehousingInspectionNoticeId);
}
@Override
public String getId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "QCWOI" + time.substring(2);
}
}

102
ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderInfoServiceImpl.java
View File

@ -1,102 +0,0 @@
package com.ruoyi.outsource.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.outsource.domain.OutsourceOrderInfo;
import com.ruoyi.outsource.mapper.OutsourceOrderInfoMapper;
import com.ruoyi.outsource.service.IOutsourceOrderInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.List;
/**
* 委外加工订单Service业务层处理
*
* @author ruoyi
* @date 2023-04-17
*/
@Service
public class OutsourceOrderInfoServiceImpl implements IOutsourceOrderInfoService
{
@Autowired
private OutsourceOrderInfoMapper outsourceOrderInfoMapper;
/**
* 查询委外加工订单
*
* @param outsourceOrderId 委外加工订单ID
* @return 委外加工订单
*/
@Override
public OutsourceOrderInfo selectOutsourceOrderInfoById(Long outsourceOrderId)
{
return outsourceOrderInfoMapper.selectOutsourceOrderInfoById(outsourceOrderId);
}
/**
* 查询委外加工订单列表
*
* @param outsourceOrderInfo 委外加工订单
* @return 委外加工订单
*/
@Override
public List<OutsourceOrderInfo> selectOutsourceOrderInfoList(OutsourceOrderInfo outsourceOrderInfo)
{
return outsourceOrderInfoMapper.selectOutsourceOrderInfoList(outsourceOrderInfo);
}
/**
* 新增委外加工订单
*
* @param outsourceOrderInfo 委外加工订单
* @return 结果
*/
@Override
public int insertOutsourceOrderInfo(OutsourceOrderInfo outsourceOrderInfo)
{
return outsourceOrderInfoMapper.insertOutsourceOrderInfo(outsourceOrderInfo);
}
/**
* 修改委外加工订单
*
* @param outsourceOrderInfo 委外加工订单
* @return 结果
*/
@Override
public int updateOutsourceOrderInfo(OutsourceOrderInfo outsourceOrderInfo)
{
return outsourceOrderInfoMapper.updateOutsourceOrderInfo(outsourceOrderInfo);
}
/**
* 删除委外加工订单对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteOutsourceOrderInfoByIds(String ids)
{
return outsourceOrderInfoMapper.deleteOutsourceOrderInfoByIds(Convert.toStrArray(ids));
}
/**
* 删除委外加工订单信息
*
* @param outsourceOrderId 委外加工订单ID
* @return 结果
*/
@Override
public int deleteOutsourceOrderInfoById(Long outsourceOrderId)
{
return outsourceOrderInfoMapper.deleteOutsourceOrderInfoById(outsourceOrderId);
}
@Override
public String getId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "OP" + time.substring(2);
}
}

94
ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderMaterialServiceImpl.java
View File

@ -1,94 +0,0 @@
package com.ruoyi.outsource.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.outsource.mapper.OutsourceOrderMaterialMapper;
import com.ruoyi.outsource.domain.OutsourceOrderMaterial;
import com.ruoyi.outsource.service.IOutsourceOrderMaterialService;
import com.ruoyi.common.core.text.Convert;
/**
* 委外加工订单物料Service业务层处理
*
* @author ruoyi
* @date 2023-04-18
*/
@Service
public class OutsourceOrderMaterialServiceImpl implements IOutsourceOrderMaterialService
{
@Autowired
private OutsourceOrderMaterialMapper outsourceOrderMaterialMapper;
/**
* 查询委外加工订单物料
*
* @param outsourceOrderMaterialId 委外加工订单物料ID
* @return 委外加工订单物料
*/
@Override
public OutsourceOrderMaterial selectOutsourceOrderMaterialById(Long outsourceOrderMaterialId)
{
return outsourceOrderMaterialMapper.selectOutsourceOrderMaterialById(outsourceOrderMaterialId);
}
/**
* 查询委外加工订单物料列表
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 委外加工订单物料
*/
@Override
public List<OutsourceOrderMaterial> selectOutsourceOrderMaterialList(OutsourceOrderMaterial outsourceOrderMaterial)
{
return outsourceOrderMaterialMapper.selectOutsourceOrderMaterialList(outsourceOrderMaterial);
}
/**
* 新增委外加工订单物料
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 结果
*/
@Override
public int insertOutsourceOrderMaterial(OutsourceOrderMaterial outsourceOrderMaterial)
{
return outsourceOrderMaterialMapper.insertOutsourceOrderMaterial(outsourceOrderMaterial);
}
/**
* 修改委外加工订单物料
*
* @param outsourceOrderMaterial 委外加工订单物料
* @return 结果
*/
@Override
public int updateOutsourceOrderMaterial(OutsourceOrderMaterial outsourceOrderMaterial)
{
return outsourceOrderMaterialMapper.updateOutsourceOrderMaterial(outsourceOrderMaterial);
}
/**
* 删除委外加工订单物料对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteOutsourceOrderMaterialByIds(String ids)
{
return outsourceOrderMaterialMapper.deleteOutsourceOrderMaterialByIds(Convert.toStrArray(ids));
}
/**
* 删除委外加工订单物料信息
*
* @param outsourceOrderMaterialId 委外加工订单物料ID
* @return 结果
*/
@Override
public int deleteOutsourceOrderMaterialById(Long outsourceOrderMaterialId)
{
return outsourceOrderMaterialMapper.deleteOutsourceOrderMaterialById(outsourceOrderMaterialId);
}
}

141
ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceProcessServiceImpl.java
View File

@ -1,141 +0,0 @@
package com.ruoyi.outsource.service.impl;
import java.text.SimpleDateFormat;
import java.util.List;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.outsource.mapper.OutsourceProcessMapper;
import com.ruoyi.outsource.domain.OutsourceProcess;
import com.ruoyi.outsource.service.IOutsourceProcessService;
import com.ruoyi.common.core.text.Convert;
/**
* 委外工序列表Service业务层处理
*
* @author zhang
* @date 2024-03-08
*/
@Service
public class OutsourceProcessServiceImpl implements IOutsourceProcessService
{
@Autowired
private OutsourceProcessMapper outsourceProcessMapper;
@Autowired
private RedisCache redisCache;
/**
* 查询委外工序列表
*
* @param outsourceProcessId 委外工序列表ID
* @return 委外工序列表
*/
@Override
public OutsourceProcess selectOutsourceProcessById(String outsourceProcessId)
{
return outsourceProcessMapper.selectOutsourceProcessById(outsourceProcessId);
}
/**
* 查询委外工序列表列表
*
* @param outsourceProcess 委外工序列表
* @return 委外工序列表
*/
@Override
public List<OutsourceProcess> selectOutsourceProcessList(OutsourceProcess outsourceProcess)
{
return outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess);
}
/**
* 新增委外工序列表
*
* @param outsourceProcess 委外工序列表
* @return 结果
*/
@Override
public int insertOutsourceProcess(OutsourceProcess outsourceProcess)
{
String loginName = ShiroUtils.getLoginName();
outsourceProcess.setCreateBy(loginName);
outsourceProcess.setCreateTime(DateUtils.getNowDate());
return outsourceProcessMapper.insertOutsourceProcess(outsourceProcess);
}
/**
* 修改委外工序列表
*
* @param outsourceProcess 委外工序列表
* @return 结果
*/
@Override
public int updateOutsourceProcess(OutsourceProcess outsourceProcess)
{
String loginName = ShiroUtils.getLoginName();
outsourceProcess.setUpdateBy(loginName);
outsourceProcess.setUpdateTime(DateUtils.getNowDate());
return outsourceProcessMapper.updateOutsourceProcess(outsourceProcess);
}
/**
* 删除委外工序列表对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteOutsourceProcessByIds(String ids)
{
return outsourceProcessMapper.deleteOutsourceProcessByIds(Convert.toStrArray(ids));
}
/**
* 删除委外工序列表信息
*
* @param outsourceProcessId 委外工序列表ID
* @return 结果
*/
@Override
public int deleteOutsourceProcessById(String outsourceProcessId)
{
return outsourceProcessMapper.deleteOutsourceProcessById(outsourceProcessId);
}
/**
* 作废委外工序列表
*
* @param outsourceProcessId 委外工序列表ID
* @return 结果
*/
@Override
public int cancelOutsourceProcessById(String outsourceProcessId)
{
return outsourceProcessMapper.cancelOutsourceProcessById(outsourceProcessId);
}
/**
* 恢复委外工序列表信息
*
* @param outsourceProcessId 委外工序列表ID
* @return 结果
*/
@Override
public int restoreOutsourceProcessById(String outsourceProcessId)
{
return outsourceProcessMapper.restoreOutsourceProcessById(outsourceProcessId);
}
/**
* 获取生成委外工序ID
* @return
*/
@Override
public Object getId() {
return redisCache.generateNo("WWGX");
}
}

165
ruoyi-admin/src/main/resources/mapper/outsource/OutsourceInspectionNoticeMapper.xml
View File

@ -1,165 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.outsource.mapper.OutsourceInspectionNoticeMapper">
<resultMap type="OutsourceInspectionNotice" id="OutsourceInspectionNoticeResult">
<result property="warehousingInspectionNoticeId" column="warehousing_inspection_notice_id" />
<result property="inNoticeNumber" column="in_notice_number" />
<result property="purchaseOrderNumber" column="purchase_order_number" />
<result property="outsourceOrderNumber" column="outsource_order_number" />
<result property="supplierCode" column="supplier_code" />
<result property="supplierName" column="supplier_name" />
<result property="customerContact" column="customer_contact" />
<result property="stockNumber" column="stock_number" />
<result property="stockName" column="stock_name" />
<result property="stockManager" column="stock_manager" />
<result property="exportSales" column="export_sales" />
<result property="warehousingCategory" column="warehousing_category" />
<result property="inspectionDate" column="inspection_date" />
<result property="warehousingDate" column="warehousing_date" />
<result property="remarks" column="remarks" />
<result property="inspectionReport" column="inspection_report" />
<result property="firstAddTime" column="first_add_time" />
<result property="updateInfoTime" column="update_info_time" />
<result property="procedureCode" column="procedure_code" />
<result property="procedureName" column="procedure_name" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
<result property="receivingPersonnel" column="receiving_personnel" />
<result property="entryPersonnel" column="entry_personnel" />
<result property="processingType" column="processing_type" />
<result property="confirmFlag" column="confirm_flag" />
<result property="confirmPerson" column="confirm_person" />
<result property="confirmTime" column="confirm_time" />
</resultMap>
<sql id="selectOutsourceInspectionNoticeVo">
select warehousing_inspection_notice_id, in_notice_number, purchase_order_number, outsource_order_number, supplier_code, supplier_name, customer_contact, stock_number, stock_name, stock_manager, export_sales, warehousing_category, inspection_date, warehousing_date, remarks, inspection_report, first_add_time, update_info_time, procedure_code, procedure_name, standby_one, standby_two, receiving_personnel, entry_personnel, processing_type, confirm_flag, confirm_person, confirm_time from warehousing_inspection_notice
where in_notice_number like '%QCWOI%'
</sql>
<select id="selectOutsourceInspectionNoticeList" parameterType="OutsourceInspectionNotice" resultMap="OutsourceInspectionNoticeResult">
<include refid="selectOutsourceInspectionNoticeVo"/>
<if test="inNoticeNumber != null and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
<if test="outsourceOrderNumber != null and outsourceOrderNumber != ''"> and outsource_order_number like concat('%', #{outsourceOrderNumber}, '%')</if>
<if test="supplierCode != null and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="params.beginInspectionDate != null and params.beginInspectionDate != '' and params.endInspectionDate != null and params.endInspectionDate != ''"> and inspection_date between #{params.beginInspectionDate} and #{params.endInspectionDate}</if>
<if test="params.beginWarehousingDate != null and params.beginWarehousingDate != '' and params.endWarehousingDate != null and params.endWarehousingDate != ''"> and warehousing_date between #{params.beginWarehousingDate} and #{params.endWarehousingDate}</if>
<if test="procedureCode != null and procedureCode != ''"> and procedure_code = #{procedureCode}</if>
<if test="procedureName != null and procedureName != ''"> and procedure_name like concat('%', #{procedureName}, '%')</if>
<if test="confirmFlag != null and confirmFlag != ''"> and confirm_flag = #{confirmFlag}</if>
</select>
<select id="selectOutsourceInspectionNoticeById" parameterType="Long" resultMap="OutsourceInspectionNoticeResult">
<include refid="selectOutsourceInspectionNoticeVo"/>
AND warehousing_inspection_notice_id = #{warehousingInspectionNoticeId}
</select>
<insert id="insertOutsourceInspectionNotice" parameterType="OutsourceInspectionNotice" useGeneratedKeys="true" keyProperty="warehousingInspectionNoticeId">
insert into warehousing_inspection_notice
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="inNoticeNumber != null and inNoticeNumber != ''">in_notice_number,</if>
<if test="purchaseOrderNumber != null">purchase_order_number,</if>
<if test="outsourceOrderNumber != null and outsourceOrderNumber != ''">outsource_order_number,</if>
<if test="supplierCode != null">supplier_code,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="customerContact != null">customer_contact,</if>
<if test="stockNumber != null">stock_number,</if>
<if test="stockName != null">stock_name,</if>
<if test="stockManager != null">stock_manager,</if>
<if test="exportSales != null">export_sales,</if>
<if test="warehousingCategory != null">warehousing_category,</if>
<if test="inspectionDate != null">inspection_date,</if>
<if test="warehousingDate != null">warehousing_date,</if>
<if test="remarks != null">remarks,</if>
<if test="inspectionReport != null">inspection_report,</if>
<if test="procedureCode != null">procedure_code,</if>
<if test="procedureName != null">procedure_name,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
<if test="receivingPersonnel != null">receiving_personnel,</if>
<if test="entryPersonnel != null">entry_personnel,</if>
<if test="processingType != null">processing_type,</if>
<if test="confirmFlag != null">confirm_flag,</if>
<if test="confirmPerson != null">confirm_person,</if>
<if test="confirmTime != null">confirm_time,</if>
first_add_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="inNoticeNumber != null and inNoticeNumber != ''">#{inNoticeNumber},</if>
<if test="purchaseOrderNumber != null">#{purchaseOrderNumber},</if>
<if test="outsourceOrderNumber != null and outsourceOrderNumber != ''">#{outsourceOrderNumber},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="customerContact != null">#{customerContact},</if>
<if test="stockNumber != null">#{stockNumber},</if>
<if test="stockName != null">#{stockName},</if>
<if test="stockManager != null">#{stockManager},</if>
<if test="exportSales != null">#{exportSales},</if>
<if test="warehousingCategory != null">#{warehousingCategory},</if>
<if test="inspectionDate != null">#{inspectionDate},</if>
<if test="warehousingDate != null">#{warehousingDate},</if>
<if test="remarks != null">#{remarks},</if>
<if test="inspectionReport != null">#{inspectionReport},</if>
<if test="procedureCode != null">#{procedureCode},</if>
<if test="procedureName != null">#{procedureName},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
<if test="receivingPersonnel != null">#{receivingPersonnel},</if>
<if test="entryPersonnel != null">#{entryPersonnel},</if>
<if test="processingType != null">#{processingType},</if>
<if test="confirmFlag != null">#{confirmFlag},</if>
<if test="confirmPerson != null">#{confirmPerson},</if>
<if test="confirmTime != null">#{confirmTime},</if>
now(),
</trim>
</insert>
<update id="updateOutsourceInspectionNotice" parameterType="OutsourceInspectionNotice">
update warehousing_inspection_notice
<trim prefix="SET" suffixOverrides=",">
<if test="inNoticeNumber != null and inNoticeNumber != ''">in_notice_number = #{inNoticeNumber},</if>
<if test="purchaseOrderNumber != null">purchase_order_number = #{purchaseOrderNumber},</if>
<if test="outsourceOrderNumber != null and outsourceOrderNumber != ''">outsource_order_number = #{outsourceOrderNumber},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="customerContact != null">customer_contact = #{customerContact},</if>
<if test="stockNumber != null">stock_number = #{stockNumber},</if>
<if test="stockName != null">stock_name = #{stockName},</if>
<if test="stockManager != null">stock_manager = #{stockManager},</if>
<if test="exportSales != null">export_sales = #{exportSales},</if>
<if test="warehousingCategory != null">warehousing_category = #{warehousingCategory},</if>
<if test="inspectionDate != null">inspection_date = #{inspectionDate},</if>
<if test="warehousingDate != null">warehousing_date = #{warehousingDate},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="inspectionReport != null">inspection_report = #{inspectionReport},</if>
<if test="procedureCode != null">procedure_code = #{procedureCode},</if>
<if test="procedureName != null">procedure_name = #{procedureName},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
<if test="receivingPersonnel != null">receiving_personnel = #{receivingPersonnel},</if>
<if test="entryPersonnel != null">entry_personnel = #{entryPersonnel},</if>
<if test="processingType != null">processing_type = #{processingType},</if>
<if test="confirmFlag != null">confirm_flag = #{confirmFlag},</if>
<if test="confirmPerson != null">confirm_person = #{confirmPerson},</if>
<if test="confirmTime != null">confirm_time = #{confirmTime},</if>
update_info_time = CONCAT_WS(',',NOW(),update_info_time),
</trim>
where warehousing_inspection_notice_id = #{warehousingInspectionNoticeId}
</update>
<delete id="deleteOutsourceInspectionNoticeById" parameterType="Long">
delete from warehousing_inspection_notice where warehousing_inspection_notice_id = #{warehousingInspectionNoticeId}
</delete>
<delete id="deleteOutsourceInspectionNoticeByIds" parameterType="String">
delete from warehousing_inspection_notice where warehousing_inspection_notice_id in
<foreach item="warehousingInspectionNoticeId" collection="array" open="(" separator="," close=")">
#{warehousingInspectionNoticeId}
</foreach>
</delete>
</mapper>

169
ruoyi-admin/src/main/resources/mapper/outsource/OutsourceOrderInfoMapper.xml
View File

@ -1,169 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.outsource.mapper.OutsourceOrderInfoMapper">
<resultMap type="OutsourceOrderInfo" id="OutsourceOrderInfoResult">
<result property="outsourceOrderId" column="outsource_order_id" />
<result property="outsourceOrderNumber" column="outsource_order_number" />
<result property="outsourceBatchNumber" column="outsource_batch_number" />
<result property="supplierCode" column="supplier_code" />
<result property="supplierName" column="supplier_name" />
<result property="customerContact" column="customer_contact" />
<result property="contactNumber" column="contact_number" />
<result property="customerFax" column="customer_fax" />
<result property="customerAddress" column="customer_address" />
<result property="deliveryTime" column="delivery_time" />
<result property="procedureCode" column="procedure_code" />
<result property="procedureName" column="procedure_name" />
<result property="issueStockNumber" column="issue_stock_number" />
<result property="issueStockName" column="issue_stock_name" />
<result property="deliveryStockNumber" column="delivery_stock_number" />
<result property="deliveryStockName" column="delivery_stock_name" />
<result property="billingTime" column="billing_time" />
<result property="remarks" column="remarks" />
<result property="carrierCompany" column="carrier_company" />
<result property="confirmFlag" column="confirm_flag" />
<result property="confirmPerson" column="confirm_person" />
<result property="confirmTime" column="confirm_time" />
<result property="closeCaseFlag" column="close_case_flag" />
<result property="closeCasePerson" column="close_case_person" />
<result property="closeCaseTime" column="close_case_time" />
<result property="firstAddTime" column="first_add_time" />
<result property="updateInfoTime" column="update_info_time" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
</resultMap>
<sql id="selectOutsourceOrderInfoVo">
select outsource_order_id, outsource_order_number, outsource_batch_number, supplier_code, supplier_name, customer_contact, contact_number, customer_fax, customer_address, delivery_time, procedure_code, procedure_name, issue_stock_number, issue_stock_name, delivery_stock_number, delivery_stock_name, billing_time, remarks, carrier_company, confirm_flag, confirm_person, confirm_time, close_case_flag, close_case_person, close_case_time, first_add_time, update_info_time, standby_one, standby_two from outsource_order_info
</sql>
<select id="selectOutsourceOrderInfoList" parameterType="OutsourceOrderInfo" resultMap="OutsourceOrderInfoResult">
<include refid="selectOutsourceOrderInfoVo"/>
<where>
<if test="outsourceOrderNumber != null and outsourceOrderNumber != ''"> and outsource_order_number like concat('%', #{outsourceOrderNumber}, '%')</if>
<if test="outsourceBatchNumber != null and outsourceBatchNumber != ''"> and outsource_batch_number like concat('%', #{outsourceBatchNumber}, '%')</if>
<if test="supplierCode != null and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="params.beginDeliveryTime != null and params.beginDeliveryTime != '' and params.endDeliveryTime != null and params.endDeliveryTime != ''"> and delivery_time between #{params.beginDeliveryTime} and #{params.endDeliveryTime}</if>
<if test="procedureName != null and procedureName != ''"> and procedure_name = #{procedureName}</if>
<if test="confirmFlag != null and confirmFlag != ''"> and confirm_flag = #{confirmFlag}</if>
<if test="closeCaseFlag != null and closeCaseFlag != ''"> and close_case_flag = #{closeCaseFlag}</if>
</where>
</select>
<select id="selectOutsourceOrderInfoById" parameterType="Long" resultMap="OutsourceOrderInfoResult">
<include refid="selectOutsourceOrderInfoVo"/>
where outsource_order_id = #{outsourceOrderId}
</select>
<insert id="insertOutsourceOrderInfo" parameterType="OutsourceOrderInfo" useGeneratedKeys="true" keyProperty="outsourceOrderId">
insert into outsource_order_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="outsourceOrderNumber != null">outsource_order_number,</if>
<if test="outsourceBatchNumber != null">outsource_batch_number,</if>
<if test="supplierCode != null">supplier_code,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="customerContact != null">customer_contact,</if>
<if test="contactNumber != null">contact_number,</if>
<if test="customerFax != null">customer_fax,</if>
<if test="customerAddress != null">customer_address,</if>
<if test="deliveryTime != null">delivery_time,</if>
<if test="procedureCode != null">procedure_code,</if>
<if test="procedureName != null">procedure_name,</if>
<if test="issueStockNumber != null">issue_stock_number,</if>
<if test="issueStockName != null">issue_stock_name,</if>
<if test="deliveryStockNumber != null">delivery_stock_number,</if>
<if test="deliveryStockName != null">delivery_stock_name,</if>
<if test="billingTime != null">billing_time,</if>
<if test="remarks != null">remarks,</if>
<if test="carrierCompany != null">carrier_company,</if>
<if test="confirmFlag != null">confirm_flag,</if>
<if test="confirmPerson != null">confirm_person,</if>
<if test="confirmTime != null">confirm_time,</if>
<if test="closeCaseFlag != null">close_case_flag,</if>
<if test="closeCasePerson != null">close_case_person,</if>
<if test="closeCaseTime != null">close_case_time,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
first_add_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="outsourceOrderNumber != null">#{outsourceOrderNumber},</if>
<if test="outsourceBatchNumber != null">#{outsourceBatchNumber},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="customerContact != null">#{customerContact},</if>
<if test="contactNumber != null">#{contactNumber},</if>
<if test="customerFax != null">#{customerFax},</if>
<if test="customerAddress != null">#{customerAddress},</if>
<if test="deliveryTime != null">#{deliveryTime},</if>
<if test="procedureCode != null">#{procedureCode},</if>
<if test="procedureName != null">#{procedureName},</if>
<if test="issueStockNumber != null">#{issueStockNumber},</if>
<if test="issueStockName != null">#{issueStockName},</if>
<if test="deliveryStockNumber != null">#{deliveryStockNumber},</if>
<if test="deliveryStockName != null">#{deliveryStockName},</if>
<if test="billingTime != null">#{billingTime},</if>
<if test="remarks != null">#{remarks},</if>
<if test="carrierCompany != null">#{carrierCompany},</if>
<if test="confirmFlag != null">#{confirmFlag},</if>
<if test="confirmPerson != null">#{confirmPerson},</if>
<if test="confirmTime != null">#{confirmTime},</if>
<if test="closeCaseFlag != null">#{closeCaseFlag},</if>
<if test="closeCasePerson != null">#{closeCasePerson},</if>
<if test="closeCaseTime != null">#{closeCaseTime},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
now(),
</trim>
</insert>
<update id="updateOutsourceOrderInfo" parameterType="OutsourceOrderInfo">
update outsource_order_info
<trim prefix="SET" suffixOverrides=",">
<if test="outsourceOrderNumber != null">outsource_order_number = #{outsourceOrderNumber},</if>
<if test="outsourceBatchNumber != null">outsource_batch_number = #{outsourceBatchNumber},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="customerContact != null">customer_contact = #{customerContact},</if>
<if test="contactNumber != null">contact_number = #{contactNumber},</if>
<if test="customerFax != null">customer_fax = #{customerFax},</if>
<if test="customerAddress != null">customer_address = #{customerAddress},</if>
<if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
<if test="procedureCode != null">procedure_code = #{procedureCode},</if>
<if test="procedureName != null">procedure_name = #{procedureName},</if>
<if test="issueStockNumber != null">issue_stock_number = #{issueStockNumber},</if>
<if test="issueStockName != null">issue_stock_name = #{issueStockName},</if>
<if test="deliveryStockNumber != null">delivery_stock_number = #{deliveryStockNumber},</if>
<if test="deliveryStockName != null">delivery_stock_name = #{deliveryStockName},</if>
<if test="billingTime != null">billing_time = #{billingTime},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="carrierCompany != null">carrier_company = #{carrierCompany},</if>
<if test="confirmFlag != null">confirm_flag = #{confirmFlag},</if>
<if test="confirmPerson != null">confirm_person = #{confirmPerson},</if>
<if test="confirmTime != null">confirm_time = #{confirmTime},</if>
<if test="closeCaseFlag != null">close_case_flag = #{closeCaseFlag},</if>
<if test="closeCasePerson != null">close_case_person = #{closeCasePerson},</if>
<if test="closeCaseTime != null">close_case_time = #{closeCaseTime},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
update_info_time = CONCAT_WS(',',NOW(),update_info_time),
</trim>
where outsource_order_id = #{outsourceOrderId}
</update>
<delete id="deleteOutsourceOrderInfoById" parameterType="Long">
delete from outsource_order_info where outsource_order_id = #{outsourceOrderId}
</delete>
<delete id="deleteOutsourceOrderInfoByIds" parameterType="String">
delete from outsource_order_info where outsource_order_id in
<foreach item="outsourceOrderId" collection="array" open="(" separator="," close=")">
#{outsourceOrderId}
</foreach>
</delete>
</mapper>

113
ruoyi-admin/src/main/resources/mapper/outsource/OutsourceOrderMaterialMapper.xml
View File

@ -1,113 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.outsource.mapper.OutsourceOrderMaterialMapper">
<resultMap type="OutsourceOrderMaterial" id="OutsourceOrderMaterialResult">
<result property="outsourceOrderMaterialId" column="outsource_order_material_id" />
<result property="outsourceOrderNumber" column="outsource_order_number" />
<result property="outsourceWorkNumber" column="outsource_work_number" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="specificationModel" column="specification_model" />
<result property="materialType" column="material_type" />
<result property="inventoryUnit" column="inventory_unit" />
<result property="quantity" column="quantity" />
<result property="processPrice" column="process_price" />
<result property="processFee" column="process_fee" />
<result property="deliveryDate" column="delivery_date" />
<result property="description" column="description" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
</resultMap>
<sql id="selectOutsourceOrderMaterialVo">
select outsource_order_material_id, outsource_order_number, outsource_work_number, material_code, material_name, specification_model, material_type, inventory_unit, quantity, process_price, process_fee, delivery_date, description, standby_one, standby_two from outsource_order_material
</sql>
<select id="selectOutsourceOrderMaterialList" parameterType="OutsourceOrderMaterial" resultMap="OutsourceOrderMaterialResult">
<include refid="selectOutsourceOrderMaterialVo"/>
<where>
<if test="outsourceOrderNumber != null and outsourceOrderNumber != ''"> and outsource_order_number like concat('%', #{outsourceOrderNumber}, '%')</if>
<if test="materialCode != null and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="materialType != null and materialType != ''"> and material_type = #{materialType}</if>
<if test="params.beginDeliveryDate != null and params.beginDeliveryDate != '' and params.endDeliveryDate != null and params.endDeliveryDate != ''"> and delivery_date between #{params.beginDeliveryDate} and #{params.endDeliveryDate}</if>
</where>
</select>
<select id="selectOutsourceOrderMaterialById" parameterType="Long" resultMap="OutsourceOrderMaterialResult">
<include refid="selectOutsourceOrderMaterialVo"/>
where outsource_order_material_id = #{outsourceOrderMaterialId}
</select>
<insert id="insertOutsourceOrderMaterial" parameterType="OutsourceOrderMaterial" useGeneratedKeys="true" keyProperty="outsourceOrderMaterialId">
insert into outsource_order_material
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="outsourceOrderNumber != null">outsource_order_number,</if>
<if test="outsourceWorkNumber != null">outsource_work_number,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
<if test="specificationModel != null">specification_model,</if>
<if test="materialType != null">material_type,</if>
<if test="inventoryUnit != null">inventory_unit,</if>
<if test="quantity != null">quantity,</if>
<if test="processPrice != null">process_price,</if>
<if test="processFee != null">process_fee,</if>
<if test="deliveryDate != null">delivery_date,</if>
<if test="description != null">description,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="outsourceOrderNumber != null">#{outsourceOrderNumber},</if>
<if test="outsourceWorkNumber != null">#{outsourceWorkNumber},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
<if test="specificationModel != null">#{specificationModel},</if>
<if test="materialType != null">#{materialType},</if>
<if test="inventoryUnit != null">#{inventoryUnit},</if>
<if test="quantity != null">#{quantity},</if>
<if test="processPrice != null">#{processPrice},</if>
<if test="processFee != null">#{processFee},</if>
<if test="deliveryDate != null">#{deliveryDate},</if>
<if test="description != null">#{description},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
</trim>
</insert>
<update id="updateOutsourceOrderMaterial" parameterType="OutsourceOrderMaterial">
update outsource_order_material
<trim prefix="SET" suffixOverrides=",">
<if test="outsourceOrderNumber != null">outsource_order_number = #{outsourceOrderNumber},</if>
<if test="outsourceWorkNumber != null">outsource_work_number = #{outsourceWorkNumber},</if>
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="specificationModel != null">specification_model = #{specificationModel},</if>
<if test="materialType != null">material_type = #{materialType},</if>
<if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="processPrice != null">process_price = #{processPrice},</if>
<if test="processFee != null">process_fee = #{processFee},</if>
<if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
<if test="description != null">description = #{description},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
</trim>
where outsource_order_material_id = #{outsourceOrderMaterialId}
</update>
<delete id="deleteOutsourceOrderMaterialById" parameterType="Long">
delete from outsource_order_material where outsource_order_material_id = #{outsourceOrderMaterialId}
</delete>
<delete id="deleteOutsourceOrderMaterialByIds" parameterType="String">
delete from outsource_order_material where outsource_order_material_id in
<foreach item="outsourceOrderMaterialId" collection="array" open="(" separator="," close=")">
#{outsourceOrderMaterialId}
</foreach>
</delete>
</mapper>

95
ruoyi-admin/src/main/resources/mapper/outsource/OutsourceProcessMapper.xml
View File

@ -1,95 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.outsource.mapper.OutsourceProcessMapper">
<resultMap type="OutsourceProcess" id="OutsourceProcessResult">
<result property="outsourceProcessId" column="outsource_process_Id" />
<result property="outsourceProcessCode" column="outsource_process_code" />
<result property="outsourceProcessName" column="outsource_process_name" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectOutsourceProcessVo">
select outsource_process_Id, outsource_process_code, outsource_process_name, remark, create_by, create_time, update_by, update_time from outsource_process
</sql>
<select id="selectOutsourceProcessList" parameterType="OutsourceProcess" resultMap="OutsourceProcessResult">
<include refid="selectOutsourceProcessVo"/>
<where>
<if test="outsourceProcessId != null and outsourceProcessId != ''"> and outsource_process_Id like concat('%', #{outsourceProcessId}, '%')</if>
<if test="outsourceProcessCode != null and outsourceProcessCode != ''"> and outsource_process_code like concat('%', #{outsourceProcessCode}, '%')</if>
<if test="outsourceProcessName != null and outsourceProcessName != ''"> and outsource_process_name like concat('%', #{outsourceProcessName}, '%')</if>
<if test="remark != null and remark != ''"> and remark = #{remark}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
<select id="selectOutsourceProcessById" parameterType="String" resultMap="OutsourceProcessResult">
<include refid="selectOutsourceProcessVo"/>
where outsource_process_Id = #{outsourceProcessId}
</select>
<insert id="insertOutsourceProcess" parameterType="OutsourceProcess">
insert into outsource_process
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="outsourceProcessId != null">outsource_process_Id,</if>
<if test="outsourceProcessCode != null and outsourceProcessCode != ''">outsource_process_code,</if>
<if test="outsourceProcessName != null and outsourceProcessName != ''">outsource_process_name,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="outsourceProcessId != null">#{outsourceProcessId},</if>
<if test="outsourceProcessCode != null and outsourceProcessCode != ''">#{outsourceProcessCode},</if>
<if test="outsourceProcessName != null and outsourceProcessName != ''">#{outsourceProcessName},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateOutsourceProcess" parameterType="OutsourceProcess">
update outsource_process
<trim prefix="SET" suffixOverrides=",">
<if test="outsourceProcessCode != null and outsourceProcessCode != ''">outsource_process_code = #{outsourceProcessCode},</if>
<if test="outsourceProcessName != null and outsourceProcessName != ''">outsource_process_name = #{outsourceProcessName},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where outsource_process_Id = #{outsourceProcessId}
</update>
<delete id="deleteOutsourceProcessById" parameterType="String">
delete from outsource_process where outsource_process_Id = #{outsourceProcessId}
</delete>
<delete id="deleteOutsourceProcessByIds" parameterType="String">
delete from outsource_process where outsource_process_Id in
<foreach item="outsourceProcessId" collection="array" open="(" separator="," close=")">
#{outsourceProcessId}
</foreach>
</delete>
<update id="cancelOutsourceProcessById" parameterType="String">
update outsource_process set del_flag = '1' where outsource_process_Id = #{outsourceProcessId}
</update>
<update id="restoreOutsourceProcessById" parameterType="String">
update outsource_process set del_flag = '0' where outsource_process_Id = #{outsourceProcessId}
</update>
</mapper>
Write Preview
Loading…
Cancel
Save