Browse Source

[delete]

删除旧版无用的成品入库通知warehousing_finish_product_notice和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据
删除旧版无用的入库表warehousing_in_info和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据
dev
liuxiaoxu 1 month ago
parent
commit
4f318afbb9
  1. 135
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WarehousingFinishProductNoticeController.java
  2. 425
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/WarehousingFinishProductNotice.java
  3. 64
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/WarehousingFinishProductNoticeMapper.java
  4. 64
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IWarehousingFinishProductNoticeService.java
  5. 103
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java
  6. 649
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java
  7. 397
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInInfo.java
  8. 71
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInInfoMapper.java
  9. 75
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInInfoService.java
  10. 158
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java
  11. 179
      ruoyi-admin/src/main/resources/mapper/manufacture/WarehousingFinishProductNoticeMapper.xml
  12. 236
      ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInInfoMapper.xml
  13. 264
      ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/add.html
  14. 240
      ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/edit.html
  15. 343
      ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/warehousingFinishProductNotice.html
  16. 166
      ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/add.html
  17. 167
      ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/edit.html
  18. 220
      ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/warehousingInInfo.html

135
ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WarehousingFinishProductNoticeController.java

@ -1,135 +0,0 @@
package com.ruoyi.manufacture.controller;
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.manufacture.domain.WarehousingFinishProductNotice;
import com.ruoyi.manufacture.service.IWarehousingFinishProductNoticeService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 成品入库通知Controller
*
* @author ruoyi
* @date 2023-04-24
*/
@Controller
@RequestMapping("/manufacture/warehousingFinishProductNotice")
public class WarehousingFinishProductNoticeController extends BaseController
{
private String prefix = "manufacture/warehousingFinishProductNotice";
@Autowired
private IWarehousingFinishProductNoticeService warehousingFinishProductNoticeService;
@RequiresPermissions("manufacture:warehousingFinishProductNotice:view")
@GetMapping()
public String warehousingFinishProductNotice()
{
return prefix + "/warehousingFinishProductNotice";
}
/**
* 查询成品入库通知列表
*/
@RequiresPermissions("manufacture:warehousingFinishProductNotice:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(WarehousingFinishProductNotice warehousingFinishProductNotice)
{
startPage();
List<WarehousingFinishProductNotice> list = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice);
return getDataTable(list);
}
/**
* 导出成品入库通知列表
*/
@RequiresPermissions("manufacture:warehousingFinishProductNotice:export")
@Log(title = "成品入库通知", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(WarehousingFinishProductNotice warehousingFinishProductNotice)
{
List<WarehousingFinishProductNotice> list = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice);
ExcelUtil<WarehousingFinishProductNotice> util = new ExcelUtil<WarehousingFinishProductNotice>(WarehousingFinishProductNotice.class);
return util.exportExcel(list, "成品入库通知数据");
}
/**
* 新增成品入库通知
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存成品入库通知
*/
@RequiresPermissions("manufacture:warehousingFinishProductNotice:add")
@Log(title = "成品入库通知", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(WarehousingFinishProductNotice warehousingFinishProductNotice)
{
return toAjax(warehousingFinishProductNoticeService.insertWarehousingFinishProductNotice(warehousingFinishProductNotice));
}
/**
* 修改成品入库通知
*/
@GetMapping("/edit/{warehousingFinishProductNoticeId}")
public String edit(@PathVariable("warehousingFinishProductNoticeId") Long warehousingFinishProductNoticeId, ModelMap mmap)
{
WarehousingFinishProductNotice warehousingFinishProductNotice = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeById(warehousingFinishProductNoticeId);
mmap.put("warehousingFinishProductNotice", warehousingFinishProductNotice);
return prefix + "/edit";
}
/**
* 修改保存成品入库通知
*/
@RequiresPermissions("manufacture:warehousingFinishProductNotice:edit")
@Log(title = "成品入库通知", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(WarehousingFinishProductNotice warehousingFinishProductNotice)
{
return toAjax(warehousingFinishProductNoticeService.updateWarehousingFinishProductNotice(warehousingFinishProductNotice));
}
/**
* 删除成品入库通知
*/
@RequiresPermissions("manufacture:warehousingFinishProductNotice:remove")
@Log(title = "成品入库通知", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(warehousingFinishProductNoticeService.deleteWarehousingFinishProductNoticeByIds(ids));
}
/**
* 获取单号
* @return
* @throws Exception
*/
@PostMapping("/id")
@ResponseBody
public Result getId() throws Exception {
return Result.getSuccessResult(warehousingFinishProductNoticeService.getId());
}
}

425
ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/WarehousingFinishProductNotice.java

@ -1,425 +0,0 @@
package com.ruoyi.manufacture.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_finish_product_notice
*
* @author ruoyi
* @date 2023-04-24
*/
public class WarehousingFinishProductNotice extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 成品入库通知id */
@Excel(name = "成品入库通知id")
private Long warehousingFinishProductNoticeId;
/** 通知单号 */
@Excel(name = "通知单号")
private String notificationNumber;
/** 工单号 */
@Excel(name = "工单号")
private String workOrderNumber;
/** 客户代码 */
@Excel(name = "客户代码")
private String enterpriseCode;
/** 客户名称 */
@Excel(name = "客户名称")
private String enterpriseName;
/** 送货人 */
@Excel(name = "送货人")
private String deliveryMan;
/** 仓库号 */
@Excel(name = "仓库号")
private String stockNumber;
/** 仓库名称 */
@Excel(name = "仓库名称")
private String stockName;
/** 仓库管理员 */
@Excel(name = "仓库管理员")
private String stockManager;
/** 入库日期 */
@Excel(name = "入库日期")
private String warehousingDate;
/** 入库类型 */
@Excel(name = "入库类型")
private String warehousingType;
/** 备注 */
@Excel(name = "备注")
private String remarks;
/** 成品代码 */
@Excel(name = "成品代码")
private String finishProductCode;
/** 成品名称 */
@Excel(name = "成品名称")
private String finishProductName;
/** 规格型号 */
@Excel(name = "规格型号")
private String specificationModel;
/** 机种 */
@Excel(name = "机种")
private String typeMachine;
/** 单位 */
@Excel(name = "单位")
private String inventoryUnit;
/** 合格数量 */
@Excel(name = "合格数量")
private String qualifiedQuantity;
/** 不合格数量 */
@Excel(name = "不合格数量")
private String unqualifiedQuantity;
/** 合格率 */
@Excel(name = "合格率")
private String passRate;
/** 说明 */
@Excel(name = "说明")
private String description;
/** 批号 */
@Excel(name = "批号")
private String batchNumber;
/** 确认否 */
@Excel(name = "确认否")
private String confirmFlag;
/** 确认人 */
@Excel(name = "确认人")
private String confirmPerson;
/** 确认时间 */
@Excel(name = "确认时间")
private String confirmTime;
/** 录入时间 */
private String firstAddTime;
/** 修改时间 */
private String updateInfoTime;
/** 备用一 */
private String standbyOne;
/** 备用二 */
private String standbyTwo;
public void setWarehousingFinishProductNoticeId(Long warehousingFinishProductNoticeId)
{
this.warehousingFinishProductNoticeId = warehousingFinishProductNoticeId;
}
public Long getWarehousingFinishProductNoticeId()
{
return warehousingFinishProductNoticeId;
}
public void setNotificationNumber(String notificationNumber)
{
this.notificationNumber = notificationNumber;
}
public String getNotificationNumber()
{
return notificationNumber;
}
public void setWorkOrderNumber(String workOrderNumber)
{
this.workOrderNumber = workOrderNumber;
}
public String getWorkOrderNumber()
{
return workOrderNumber;
}
public void setEnterpriseCode(String enterpriseCode)
{
this.enterpriseCode = enterpriseCode;
}
public String getEnterpriseCode()
{
return enterpriseCode;
}
public void setEnterpriseName(String enterpriseName)
{
this.enterpriseName = enterpriseName;
}
public String getEnterpriseName()
{
return enterpriseName;
}
public void setDeliveryMan(String deliveryMan)
{
this.deliveryMan = deliveryMan;
}
public String getDeliveryMan()
{
return deliveryMan;
}
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 setWarehousingDate(String warehousingDate)
{
this.warehousingDate = warehousingDate;
}
public String getWarehousingDate()
{
return warehousingDate;
}
public void setWarehousingType(String warehousingType)
{
this.warehousingType = warehousingType;
}
public String getWarehousingType()
{
return warehousingType;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
public void setFinishProductCode(String finishProductCode)
{
this.finishProductCode = finishProductCode;
}
public String getFinishProductCode()
{
return finishProductCode;
}
public void setFinishProductName(String finishProductName)
{
this.finishProductName = finishProductName;
}
public String getFinishProductName()
{
return finishProductName;
}
public void setSpecificationModel(String specificationModel)
{
this.specificationModel = specificationModel;
}
public String getSpecificationModel()
{
return specificationModel;
}
public void setTypeMachine(String typeMachine)
{
this.typeMachine = typeMachine;
}
public String getTypeMachine()
{
return typeMachine;
}
public void setInventoryUnit(String inventoryUnit)
{
this.inventoryUnit = inventoryUnit;
}
public String getInventoryUnit()
{
return inventoryUnit;
}
public void setQualifiedQuantity(String qualifiedQuantity)
{
this.qualifiedQuantity = qualifiedQuantity;
}
public String getQualifiedQuantity()
{
return qualifiedQuantity;
}
public void setUnqualifiedQuantity(String unqualifiedQuantity)
{
this.unqualifiedQuantity = unqualifiedQuantity;
}
public String getUnqualifiedQuantity()
{
return unqualifiedQuantity;
}
public void setPassRate(String passRate)
{
this.passRate = passRate;
}
public String getPassRate()
{
return passRate;
}
public void setDescription(String description)
{
this.description = description;
}
public String getDescription()
{
return description;
}
public void setBatchNumber(String batchNumber)
{
this.batchNumber = batchNumber;
}
public String getBatchNumber()
{
return batchNumber;
}
public String getConfirmFlag() {
return confirmFlag;
}
public void setConfirmFlag(String confirmFlag) {
this.confirmFlag = confirmFlag;
}
public String getConfirmPerson() {
return confirmPerson;
}
public void setConfirmPerson(String confirmPerson) {
this.confirmPerson = confirmPerson;
}
public String getConfirmTime() {
return confirmTime;
}
public void setConfirmTime(String confirmTime) {
this.confirmTime = confirmTime;
}
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("warehousingFinishProductNoticeId", getWarehousingFinishProductNoticeId())
.append("notificationNumber", getNotificationNumber())
.append("workOrderNumber", getWorkOrderNumber())
.append("enterpriseCode", getEnterpriseCode())
.append("enterpriseName", getEnterpriseName())
.append("deliveryMan", getDeliveryMan())
.append("stockNumber", getStockNumber())
.append("stockName", getStockName())
.append("stockManager", getStockManager())
.append("warehousingDate", getWarehousingDate())
.append("warehousingType", getWarehousingType())
.append("remarks", getRemarks())
.append("finishProductCode", getFinishProductCode())
.append("finishProductName", getFinishProductName())
.append("specificationModel", getSpecificationModel())
.append("typeMachine", getTypeMachine())
.append("inventoryUnit", getInventoryUnit())
.append("qualifiedQuantity", getQualifiedQuantity())
.append("unqualifiedQuantity", getUnqualifiedQuantity())
.append("passRate", getPassRate())
.append("description", getDescription())
.append("batchNumber", getBatchNumber())
.append("confirmFlag", getConfirmFlag())
.append("confirmPerson", getConfirmPerson())
.append("confirmTime", getConfirmTime())
.append("firstAddTime", getFirstAddTime())
.append("updateInfoTime", getUpdateInfoTime())
.append("standbyOne", getStandbyOne())
.append("standbyTwo", getStandbyTwo())
.toString();
}
}

64
ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/WarehousingFinishProductNoticeMapper.java

@ -1,64 +0,0 @@
package com.ruoyi.manufacture.mapper;
import com.ruoyi.manufacture.domain.WarehousingFinishProductNotice;
import java.util.List;
/**
* 成品入库通知Mapper接口
*
* @author ruoyi
* @date 2023-04-24
*/
public interface WarehousingFinishProductNoticeMapper
{
/**
* 查询成品入库通知
*
* @param warehousingFinishProductNoticeId 成品入库通知ID
* @return 成品入库通知
*/
public WarehousingFinishProductNotice selectWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId);
/**
* 查询成品入库通知列表
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 成品入库通知集合
*/
public List<WarehousingFinishProductNotice> selectWarehousingFinishProductNoticeList(WarehousingFinishProductNotice warehousingFinishProductNotice);
/**
* 新增成品入库通知
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 结果
*/
public int insertWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice);
/**
* 修改成品入库通知
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 结果
*/
public int updateWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice);
/**
* 删除成品入库通知
*
* @param warehousingFinishProductNoticeId 成品入库通知ID
* @return 结果
*/
public int deleteWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId);
/**
* 批量删除成品入库通知
*
* @param warehousingFinishProductNoticeIds 需要删除的数据ID
* @return 结果
*/
public int deleteWarehousingFinishProductNoticeByIds(String[] warehousingFinishProductNoticeIds);
public List<WarehousingFinishProductNotice> selectByIdDesc();
}

64
ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IWarehousingFinishProductNoticeService.java

@ -1,64 +0,0 @@
package com.ruoyi.manufacture.service;
import com.ruoyi.manufacture.domain.WarehousingFinishProductNotice;
import java.util.List;
/**
* 成品入库通知Service接口
*
* @author ruoyi
* @date 2023-04-24
*/
public interface IWarehousingFinishProductNoticeService
{
/**
* 查询成品入库通知
*
* @param warehousingFinishProductNoticeId 成品入库通知ID
* @return 成品入库通知
*/
public WarehousingFinishProductNotice selectWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId);
/**
* 查询成品入库通知列表
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 成品入库通知集合
*/
public List<WarehousingFinishProductNotice> selectWarehousingFinishProductNoticeList(WarehousingFinishProductNotice warehousingFinishProductNotice);
/**
* 新增成品入库通知
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 结果
*/
public int insertWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice);
/**
* 修改成品入库通知
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 结果
*/
public int updateWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice);
/**
* 批量删除成品入库通知
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteWarehousingFinishProductNoticeByIds(String ids);
/**
* 删除成品入库通知信息
*
* @param warehousingFinishProductNoticeId 成品入库通知ID
* @return 结果
*/
public int deleteWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId);
public String getId();
}

103
ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java

@ -1,103 +0,0 @@
package com.ruoyi.manufacture.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.manufacture.domain.WarehousingFinishProductNotice;
import com.ruoyi.manufacture.mapper.WarehousingFinishProductNoticeMapper;
import com.ruoyi.manufacture.service.IWarehousingFinishProductNoticeService;
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-24
*/
@Service
public class WarehousingFinishProductNoticeServiceImpl implements IWarehousingFinishProductNoticeService
{
@Autowired
private WarehousingFinishProductNoticeMapper warehousingFinishProductNoticeMapper;
/**
* 查询成品入库通知
*
* @param warehousingFinishProductNoticeId 成品入库通知ID
* @return 成品入库通知
*/
@Override
public WarehousingFinishProductNotice selectWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId)
{
return warehousingFinishProductNoticeMapper.selectWarehousingFinishProductNoticeById(warehousingFinishProductNoticeId);
}
/**
* 查询成品入库通知列表
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 成品入库通知
*/
@Override
public List<WarehousingFinishProductNotice> selectWarehousingFinishProductNoticeList(WarehousingFinishProductNotice warehousingFinishProductNotice)
{
return warehousingFinishProductNoticeMapper.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice);
}
/**
* 新增成品入库通知
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 结果
*/
@Override
public int insertWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice)
{
return warehousingFinishProductNoticeMapper.insertWarehousingFinishProductNotice(warehousingFinishProductNotice);
}
/**
* 修改成品入库通知
*
* @param warehousingFinishProductNotice 成品入库通知
* @return 结果
*/
@Override
public int updateWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice)
{
return warehousingFinishProductNoticeMapper.updateWarehousingFinishProductNotice(warehousingFinishProductNotice);
}
/**
* 删除成品入库通知对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteWarehousingFinishProductNoticeByIds(String ids)
{
return warehousingFinishProductNoticeMapper.deleteWarehousingFinishProductNoticeByIds(Convert.toStrArray(ids));
}
/**
* 删除成品入库通知信息
*
* @param warehousingFinishProductNoticeId 成品入库通知ID
* @return 结果
*/
@Override
public int deleteWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId)
{
return warehousingFinishProductNoticeMapper.deleteWarehousingFinishProductNoticeById(warehousingFinishProductNoticeId);
}
@Override
public String getId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "IVCP" + time.substring(2);
}
}

649
ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java

@ -1,649 +0,0 @@
package com.ruoyi.storehouse.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.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.manufacture.domain.WarehousingFinishProductNotice;
import com.ruoyi.manufacture.domain.WorkOrderInfo;
import com.ruoyi.manufacture.service.IWarehousingFinishProductNoticeService;
import com.ruoyi.manufacture.service.IWorkOrderInfoService;
import com.ruoyi.storehouse.domain.WarehousingInDetail;
import com.ruoyi.storehouse.domain.WarehousingInInfo;
import com.ruoyi.storehouse.domain.exportDto.WarehousingInDetailDto;
import com.ruoyi.storehouse.domain.exportDto.WarehousingInInfoDto;
import com.ruoyi.storehouse.service.IWarehousingInDetailService;
import com.ruoyi.storehouse.service.IWarehousingInInfoService;
import com.ruoyi.storehouse.utils.CustomRowWriteHandler;
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.math.BigDecimal;
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-26
*/
@Controller
@RequestMapping("/storehouse/warehousingInInfo")
public class WarehousingInInfoController extends BaseController
{
private String prefix = "storehouse/warehousingInInfo";
private String prefixRaw = "storehouse/warehousingInRawMaterial";
private String prefixSubsidiary = "storehouse/warehousingInSubsidiary";
private String prefixFinishProduct = "storehouse/warehousingInFinishProduct";
private String prefixRGFinishProduct = "storehouse/warehousingInRGFinishProduct";
private String prefixPDFinishProduct = "storehouse/warehousingInPDFinishProduct";
private String prefixPDBcp = "storehouse/warehousingInPDBcp";
@Autowired
private IWarehousingInInfoService warehousingInInfoService;
@Autowired
private IWarehousingInDetailService warehousingInDetailService;
@Autowired
private IWarehousingFinishProductNoticeService warehousingFinishProductNoticeService;
@Autowired
private IWorkOrderInfoService workOrderInfoService;
//excel数据量
private Integer excelSize = 9;
/**
* 页面跳转
* @return
*/
// @RequiresPermissions("storehouse:warehousingInInfo:view")
// @GetMapping()
// public String warehousingInInfo()
// {
// return prefix + "/warehousingInInfo";
// }
@RequiresPermissions("storehouse:warehousingInInfo:viewRaw")
@GetMapping ("/viewRaw")
public String warehousingInRawMaterial()
{
return prefixRaw + "/warehousingInRawMaterial";
}
@RequiresPermissions("storehouse:warehousingInInfo:viewSubsidiary")
@GetMapping("/viewSubsidiary")
public String warehousingInSubsidiary()
{
return prefixSubsidiary + "/warehousingInSubsidiary";
}
@RequiresPermissions("storehouse:warehousingInInfo:viewFinishProduct")
@GetMapping("/viewFinishProduct")
public String warehousingInFinishProduct()
{
return prefixFinishProduct + "/warehousingInFinishProduct";
}
@RequiresPermissions("storehouse:warehousingInInfo:viewRGFinishProduct")
@GetMapping("/viewRGFinishProduct")
public String warehousingInRGFinishProduct()
{
return prefixRGFinishProduct + "/warehousingInRGFinishProduct";
}
@RequiresPermissions("storehouse:warehousingInInfo:viewPDFinishProduct")
@GetMapping("/viewPDFinishProduct")
public String warehousingInPDFinishProduct()
{
return prefixPDFinishProduct + "/warehousingInPDFinishProduct";
}
@RequiresPermissions("storehouse:warehousingInInfo:viewPDBcp")
@GetMapping("/viewPDBcp")
public String warehousingInPDBcp()
{
return prefixPDBcp + "/warehousingInPDBcp";
}
// @RequiresPermissions("storehouse:warehousingInInfo:list")
// @PostMapping("/list")
// @ResponseBody
// public TableDataInfo list(WarehousingInInfo warehousingInInfo)
// {
// startPage();
// List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInInfoList(warehousingInInfo);
// return getDataTable(list);
// }
/**
* 查询入库列表
*/
@RequiresPermissions("storehouse:warehousingInInfo:listRaw")
@PostMapping("/listRaw")
@ResponseBody
public TableDataInfo listRaw(WarehousingInInfo warehousingInInfo)
{
startPage();
List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInRawMaterialByNumber(warehousingInInfo);
return getDataTable(list);
}
@RequiresPermissions("storehouse:warehousingInInfo:listSubsidiary")
@PostMapping("/listSubsidiary")
@ResponseBody
public TableDataInfo listSubsidiary(WarehousingInInfo warehousingInInfo)
{
startPage();
List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInSubsidiaryByNumber(warehousingInInfo);
return getDataTable(list);
}
@RequiresPermissions("storehouse:warehousingInInfo:listFinishProduct")
@PostMapping("/listFinishProduct")
@ResponseBody
public TableDataInfo listFinishProduct(WarehousingInInfo warehousingInInfo)
{
startPage();
List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInFinishProductByNumber(warehousingInInfo);
return getDataTable(list);
}
@RequiresPermissions("storehouse:warehousingInInfo:listRGFinishProduct")
@PostMapping("/listRGFinishProduct")
@ResponseBody
public TableDataInfo listRGFinishProduct(WarehousingInInfo warehousingInInfo)
{
startPage();
List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInRGFinishProductByNumber(warehousingInInfo);
return getDataTable(list);
}
@RequiresPermissions("storehouse:warehousingInInfo:listPDFinishProduct")
@PostMapping("/listPDFinishProduct")
@ResponseBody
public TableDataInfo listPDFinishProduct(WarehousingInInfo warehousingInInfo)
{
startPage();
List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInPDFinishProductByNumber(warehousingInInfo);
return getDataTable(list);
}
@RequiresPermissions("storehouse:warehousingInInfo:listPDBcp")
@PostMapping("/listPDBcp")
@ResponseBody
public TableDataInfo listPDBcp(WarehousingInInfo warehousingInInfo)
{
startPage();
List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInPDBcpByNumber(warehousingInInfo);
return getDataTable(list);
}
/**
* 导出入库列表
*/
@RequiresPermissions("storehouse:warehousingInInfo:export")
@Log(title = "入库", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(WarehousingInInfo warehousingInInfo)
{
List<WarehousingInInfo> list = warehousingInInfoService.selectWarehousingInInfoList(warehousingInInfo);
ExcelUtil<WarehousingInInfo> util = new ExcelUtil<WarehousingInInfo>(WarehousingInInfo.class);
return util.exportExcel(list, "入库数据");
}
/**
* 新增入库
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
@GetMapping("/addRaw")
public String addRaw()
{
return prefixRaw + "/add";
}
@GetMapping("/addSubsidiary")
public String addSubsidiary()
{
return prefixSubsidiary + "/add";
}
@GetMapping("/addFinishProduct")
public String addFinishProduct()
{
return prefixFinishProduct + "/add";
}
@GetMapping("/addRGFinishProduct")
public String addRGFinishProduct()
{
return prefixRGFinishProduct + "/add";
}
@GetMapping("/addPDFinishProduct")
public String addPDFinishProduct()
{
return prefixPDFinishProduct + "/add";
}
@GetMapping("/addPDBcp")
public String addPDBcp()
{
return prefixPDBcp + "/add";
}
/**
* 新增保存入库
*/
@RequiresPermissions("storehouse:warehousingInInfo:add")
@Log(title = "入库", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(WarehousingInInfo warehousingInInfo)
{
return toAjax(warehousingInInfoService.insertWarehousingInInfo(warehousingInInfo));
}
/**
* 修改入库
*/
@GetMapping("/editRaw/{warehousingInfoId}")
public String editRaw(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap)
{
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
mmap.put("warehousingInInfo", warehousingInInfo);
return prefixRaw + "/edit";
}
@GetMapping("/editSubsidiary/{warehousingInfoId}")
public String editSubsidiary(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap)
{
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
mmap.put("warehousingInInfo", warehousingInInfo);
return prefixSubsidiary + "/edit";
}
@GetMapping("/editFinishProduct/{warehousingInfoId}")
public String editFinishProduct(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap)
{
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
mmap.put("warehousingInInfo", warehousingInInfo);
return prefixFinishProduct + "/edit";
}
@GetMapping("/editRGFinishProduct/{warehousingInfoId}")
public String editRGFinishProduct(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap)
{
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
mmap.put("warehousingInInfo", warehousingInInfo);
return prefixRGFinishProduct + "/edit";
}
@GetMapping("/editPDFinishProduct/{warehousingInfoId}")
public String editPDFinishProduct(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap)
{
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
mmap.put("warehousingInInfo", warehousingInInfo);
return prefixPDFinishProduct + "/edit";
}
@GetMapping("/editPDBcp/{warehousingInfoId}")
public String editPDBcp(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap)
{
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
mmap.put("warehousingInInfo", warehousingInInfo);
return prefixPDBcp + "/edit";
}
/**
* 修改保存入库
*/
@RequiresPermissions("storehouse:warehousingInInfo:edit")
@Log(title = "入库", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(WarehousingInInfo warehousingInInfo)
{
return toAjax(warehousingInInfoService.updateWarehousingInInfo(warehousingInInfo));
}
/**
* 删除入库
*/
@RequiresPermissions("storehouse:warehousingInInfo:remove")
@Log(title = "入库", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(warehousingInInfoService.deleteWarehousingInInfoByIds(ids));
}
/**
* 获取订单id
* @return
* @throws Exception
*/
@PostMapping("/getRawId")
@ResponseBody
public Result getRawId() throws Exception {
return Result.getSuccessResult(warehousingInInfoService.getRawId());
}
@PostMapping("/getSubsidiaryId")
@ResponseBody
public Result getSubsidiaryId() throws Exception {
return Result.getSuccessResult(warehousingInInfoService.getSubsidiaryId());
}
@PostMapping("/getFinishProductId")
@ResponseBody
public Result getFinishProductId() throws Exception {
return Result.getSuccessResult(warehousingInInfoService.getFinishProductId());
}
@PostMapping("/getRGFinishProductId")
@ResponseBody
public Result getRGFinishProductId() throws Exception {
return Result.getSuccessResult(warehousingInInfoService.getRGFinishProductId());
}
@PostMapping("/getPDFinishProductId")
@ResponseBody
public Result getPDFinishProductId() throws Exception {
return Result.getSuccessResult(warehousingInInfoService.getPDFinishProductId());
}
@PostMapping("/getPDBcpId")
@ResponseBody
public Result getPDBcpId() throws Exception {
return Result.getSuccessResult(warehousingInInfoService.getPDBcpId());
}
@RequiresPermissions("storehouse:warehousingInInfo: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++) {
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(Long.valueOf(idsStr[i]));
WarehousingInDetail warehousingInDetail = new WarehousingInDetail();
warehousingInDetail.setWarehousingNumber(warehousingInInfo.getWarehousingNumber());
List<WarehousingInDetail> list = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail);
if (list.size()>0) {
for (int j=0;j<list.size();j++) {
warehousingInDetailService.deleteWarehousingInDetailById(list.get(j).getWarehousingDetailId());
}
}
}
warehousingInInfoService.deleteWarehousingInInfoByIds(ids);
return "操作成功!";
}
/**
* 导出原料入库单
*/
@RequiresPermissions("storehouse:warehousingInInfo:export")
@Log(title = "入库", businessType = BusinessType.EXPORT)
@RequestMapping("/exportSelectedRaw/{warehousingInfoId}")
@ResponseBody
public void exportSelectedRaw(@PathVariable("warehousingInfoId") Long warehousingInfoId, HttpServletResponse response) throws IOException {
//
System.out.println(warehousingInfoId);
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
WarehousingInInfoDto warehousingInInfoDto = new WarehousingInInfoDto();
BeanUtils.copyProperties(warehousingInInfo,warehousingInInfoDto);
WarehousingInDetail warehousingInDetail= new WarehousingInDetail();
warehousingInDetail.setWarehousingNumber(warehousingInInfo.getWarehousingNumber());
// 创建列合并工具类对象
ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils();
List<WarehousingInDetail> warehousingInDetailList = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail);
List<WarehousingInDetailDto> warehousingInDetailDtoList = new ArrayList<>();
try {
int number = 0;
Iterator values= warehousingInDetailList.iterator();
while(values.hasNext()) {
Object source = values.next();
WarehousingInDetailDto target = WarehousingInDetailDto.class.newInstance();
BeanUtils.copyProperties(source, target);
mergePrevColUtils.add(number+4,1,1);
mergePrevColUtils.add(number+4,3,1);
target.setNumber(++number);
warehousingInDetailDtoList.add(target);
}
}catch (Exception e) {
log.error(">>>>>>异常<<<<<<", e);
}
System.out.println(warehousingInDetailDtoList);
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\\原料入库单.xlsx";
try (ExcelWriter excelWriter = EasyExcel
.write(response.getOutputStream(), WarehousingInDetailDto.class)
.withTemplate(templateFileName)
.registerWriteHandler(mergePrevColUtils)
//样式注册
.registerWriteHandler(horizontalCellStyleStrategyBuilder())
.build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
excelWriter.fill(warehousingInDetailDtoList, fillConfig, writeSheet);
Map<String, Object> map = MapUtils.newHashMap();
// map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now()));
map.put("purchaseOrderNumber", warehousingInInfoDto.getPurchaseOrderNumber());
map.put("warehousingNumber", warehousingInInfoDto.getWarehousingNumber());
map.put("supplierName", warehousingInInfoDto.getSupplierName());
map.put("warehousingDate", warehousingInInfoDto.getWarehousingDate());
map.put("documentPreparationPersonnel", warehousingInInfoDto.getDocumentPreparationPersonnel());
excelWriter.fill(map, writeSheet);
}
}
/**
* 导出辅料入库单
*/
@RequiresPermissions("storehouse:warehousingInInfo:export")
@Log(title = "入库", businessType = BusinessType.EXPORT)
@RequestMapping("/exportSelectedSubsidiary/{warehousingInfoId}")
@ResponseBody
public void exportSelectedSubsidiary(@PathVariable("warehousingInfoId") Long warehousingInfoId, HttpServletResponse response) throws IOException {
//
System.out.println(warehousingInfoId);
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
WarehousingInInfoDto warehousingInInfoDto = new WarehousingInInfoDto();
BeanUtils.copyProperties(warehousingInInfo,warehousingInInfoDto);
WarehousingInDetail warehousingInDetail= new WarehousingInDetail();
warehousingInDetail.setWarehousingNumber(warehousingInInfo.getWarehousingNumber());
// 创建列合并工具类对象
ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils();
List<WarehousingInDetail> warehousingInDetailList = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail);
List<WarehousingInDetailDto> warehousingInDetailDtoList = new ArrayList<>();
try {
int number = 0;
Iterator values= warehousingInDetailList.iterator();
while(values.hasNext()) {
Object source = values.next();
WarehousingInDetailDto target = WarehousingInDetailDto.class.newInstance();
BeanUtils.copyProperties(source, target);
mergePrevColUtils.add(number+4,1,1);
mergePrevColUtils.add(number+4,3,1);
target.setNumber(++number);
warehousingInDetailDtoList.add(target);
}
}catch (Exception e) {
log.error(">>>>>>异常<<<<<<", e);
}
System.out.println(warehousingInDetailDtoList);
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\\辅料入库单.xlsx";
try (ExcelWriter excelWriter = EasyExcel
.write(response.getOutputStream(), WarehousingInDetailDto.class)
.withTemplate(templateFileName)
.registerWriteHandler(mergePrevColUtils)
//样式注册
.registerWriteHandler(horizontalCellStyleStrategyBuilder())
.build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
excelWriter.fill(warehousingInDetailDtoList, fillConfig, writeSheet);
Map<String, Object> map = MapUtils.newHashMap();
// map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now()));
map.put("purchaseOrderNumber", warehousingInInfoDto.getPurchaseOrderNumber());
map.put("warehousingNumber", warehousingInInfoDto.getWarehousingNumber());
map.put("supplierName", warehousingInInfoDto.getSupplierName());
map.put("warehousingDate", warehousingInInfoDto.getWarehousingDate());
map.put("documentPreparationPersonnel", warehousingInInfoDto.getDocumentPreparationPersonnel());
excelWriter.fill(map, writeSheet);
}
}
/**
* 导出成品入库单
*/
@RequiresPermissions("storehouse:warehousingInInfo:export")
@Log(title = "入库", businessType = BusinessType.EXPORT)
@RequestMapping("/exportSelectedFinishProduct/{warehousingInfoId}")
@ResponseBody
public void exportSelectedFinishProduct(@PathVariable("warehousingInfoId") Long warehousingInfoId, HttpServletResponse response) throws IOException {
//
// System.out.println(warehousingInfoId);
WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId);
WarehousingInInfoDto warehousingInInfoDto = new WarehousingInInfoDto();
BeanUtils.copyProperties(warehousingInInfo,warehousingInInfoDto);
WarehousingInDetail warehousingInDetail= new WarehousingInDetail();
warehousingInDetail.setWarehousingNumber(warehousingInInfo.getWarehousingNumber());
// 创建列合并工具类对象
ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils();
List<WarehousingInDetail> warehousingInDetailList = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail);
List<WarehousingInDetailDto> warehousingInDetailDtoList = new ArrayList<>();
try {
int number = 0;
Iterator values= warehousingInDetailList.iterator();
while(values.hasNext()) {
Object source = values.next();
WarehousingInDetailDto target = WarehousingInDetailDto.class.newInstance();
BeanUtils.copyProperties(source, target);
mergePrevColUtils.add(number+7,1,1);
WorkOrderInfo workOrderInfo = new WorkOrderInfo();
workOrderInfo.setWorkOrderNumber(warehousingInInfo.getWorkOrderNumber());
List<WorkOrderInfo> workOrderInfoList = workOrderInfoService.selectWorkOrderInfoList(workOrderInfo);
WarehousingFinishProductNotice warehousingFinishProductNotice = new WarehousingFinishProductNotice();
warehousingFinishProductNotice.setWorkOrderNumber(warehousingInInfo.getWorkOrderNumber());
List<WarehousingFinishProductNotice> warehousingFinishProductNoticeList = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice);
target.setSalesOrderNumber(workOrderInfoList.get(0).getSalesOrderNumber());
BigDecimal qualifiedQuantity = new BigDecimal(warehousingFinishProductNoticeList.get(0).getQualifiedQuantity());
BigDecimal unQualifiedQuantity = new BigDecimal(warehousingFinishProductNoticeList.get(0).getUnqualifiedQuantity());
target.setAcceptanceQuantity(String.valueOf(qualifiedQuantity.add(unQualifiedQuantity)));
target.setRejectionQuantity(warehousingFinishProductNoticeList.get(0).getUnqualifiedQuantity());
target.setNumber(++number);
target.setInspectionStatus("OK");
warehousingInDetailDtoList.add(target);
}
int size = warehousingInDetailDtoList.size();
if (warehousingInDetailDtoList.size()<excelSize) {
int excelMinus = excelSize-size;
for (int i =0;i<excelMinus;i++) {
WarehousingInDetailDto warehousingInDetailDto = new WarehousingInDetailDto();
warehousingInDetailDto.setNumber(++number);
warehousingInDetailDto.setSalesOrderNumber("");
warehousingInDetailDto.setMaterialCode("");
warehousingInDetailDto.setMaterialName("");
warehousingInDetailDto.setSpecificationModel("");
warehousingInDetailDto.setWarehousingQuantity("");
warehousingInDetailDto.setScrapQuantity("");
warehousingInDetailDto.setAcceptanceQuantity("");
warehousingInDetailDto.setRejectionQuantity("");
warehousingInDetailDto.setInspectionStatus("");
warehousingInDetailDto.setWarehouseNameRemarks("");
// mergePrevColUtils.add(number+7,1,1);
warehousingInDetailDtoList.add(warehousingInDetailDto);
}
}
}catch (Exception e) {
log.error(">>>>>>异常<<<<<<", e);
}
// System.out.println(warehousingInDetailDtoList);
for (int i=0;i<warehousingInDetailDtoList.size();i++) {
mergePrevColUtils.add(i+7,1,1);
}
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\\exportWarehousingInCP.xlsx";
try (ExcelWriter excelWriter = EasyExcel
.write(response.getOutputStream(), WarehousingInDetailDto.class)
.withTemplate(templateFileName)
// .registerWriteHandler(mergePrevColUtils)
//样式注册
// .registerWriteHandler(horizontalCellStyleStrategyBuilder())
.registerWriteHandler(new CustomRowWriteHandler(1))
.build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
excelWriter.fill(warehousingInDetailDtoList, fillConfig, writeSheet);
Map<String, Object> map = MapUtils.newHashMap();
// map.put("date", DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDateTime.now()));
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.THIN);
contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
}
}

397
ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInInfo.java

@ -1,397 +0,0 @@
package com.ruoyi.storehouse.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_in_info
*
* @author ruoyi
* @date 2023-04-26
*/
public class WarehousingInInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 入库id */
private Long warehousingInfoId;
/** 入库单号 */
@Excel(name = "入库单号")
private String warehousingNumber;
/** 暂收单号 */
@Excel(name = "暂收单号")
private String inNoticeNumber;
/** 入库类型 */
@Excel(name = "入库类型")
private String warehousingCategory;
/** 采购订单号 */
@Excel(name = "采购订单号")
private String purchaseOrderNumber;
/** 联系人 */
@Excel(name = "联系人")
private String contacts;
/** 入库日期 */
@Excel(name = "入库日期")
private String warehousingDate;
/** 供应商代码 */
@Excel(name = "供应商代码")
private String supplierCode;
/** 供应商名称 */
@Excel(name = "供应商名称")
private String supplierName;
/** 制单人员 */
@Excel(name = "制单人员")
private String documentPreparationPersonnel;
/** 仓库号 */
@Excel(name = "仓库号")
private String stockNumber;
/** 仓库名称 */
@Excel(name = "仓库名称")
private String stockName;
/** 仓库管理员 */
@Excel(name = "仓库管理员")
private String stockManager;
/** 内外销 */
@Excel(name = "内外销")
private String exportSales;
/** 备注 */
@Excel(name = "备注")
private String remarks;
/** 送货人 */
@Excel(name = "送货人")
private String deliveryMan;
/** 退货单号 */
@Excel(name = "退货单号")
private String returnGoodsNumber;
/** 客户代码 */
@Excel(name = "客户代码")
private String enterpriseCode;
/** 客户名称 */
@Excel(name = "客户名称")
private String enterpriseName;
/** 入库通知单号 */
@Excel(name = "入库通知单号")
private String notificationNumber;
/** 工单号 */
@Excel(name = "工单号")
private String workOrderNumber;
/** 部门编号 */
@Excel(name = "部门编号")
private String deptCode;
/** 部门名称 */
@Excel(name = "部门名称")
private String deptName;
/** 录入时间 */
private String firstAddTime;
/** 修改时间 */
private String updateInfoTime;
/** 入库方式 */
private String warehousingInWay;
/** 备用二 */
private String standbyTwo;
public void setWarehousingInfoId(Long warehousingInfoId)
{
this.warehousingInfoId = warehousingInfoId;
}
public Long getWarehousingInfoId()
{
return warehousingInfoId;
}
public void setWarehousingNumber(String warehousingNumber)
{
this.warehousingNumber = warehousingNumber;
}
public String getWarehousingNumber()
{
return warehousingNumber;
}
public void setInNoticeNumber(String inNoticeNumber)
{
this.inNoticeNumber = inNoticeNumber;
}
public String getInNoticeNumber()
{
return inNoticeNumber;
}
public void setWarehousingCategory(String warehousingCategory)
{
this.warehousingCategory = warehousingCategory;
}
public String getWarehousingCategory()
{
return warehousingCategory;
}
public void setPurchaseOrderNumber(String purchaseOrderNumber)
{
this.purchaseOrderNumber = purchaseOrderNumber;
}
public String getPurchaseOrderNumber()
{
return purchaseOrderNumber;
}
public void setContacts(String contacts)
{
this.contacts = contacts;
}
public String getContacts()
{
return contacts;
}
public void setWarehousingDate(String warehousingDate)
{
this.warehousingDate = warehousingDate;
}
public String getWarehousingDate()
{
return warehousingDate;
}
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 setDocumentPreparationPersonnel(String documentPreparationPersonnel)
{
this.documentPreparationPersonnel = documentPreparationPersonnel;
}
public String getDocumentPreparationPersonnel()
{
return documentPreparationPersonnel;
}
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 setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
public void setDeliveryMan(String deliveryMan)
{
this.deliveryMan = deliveryMan;
}
public String getDeliveryMan()
{
return deliveryMan;
}
public void setReturnGoodsNumber(String returnGoodsNumber)
{
this.returnGoodsNumber = returnGoodsNumber;
}
public String getReturnGoodsNumber()
{
return returnGoodsNumber;
}
public void setEnterpriseCode(String enterpriseCode)
{
this.enterpriseCode = enterpriseCode;
}
public String getEnterpriseCode()
{
return enterpriseCode;
}
public void setEnterpriseName(String enterpriseName)
{
this.enterpriseName = enterpriseName;
}
public String getEnterpriseName()
{
return enterpriseName;
}
public void setNotificationNumber(String notificationNumber)
{
this.notificationNumber = notificationNumber;
}
public String getNotificationNumber()
{
return notificationNumber;
}
public void setWorkOrderNumber(String workOrderNumber)
{
this.workOrderNumber = workOrderNumber;
}
public String getWorkOrderNumber()
{
return workOrderNumber;
}
public void setDeptCode(String deptCode)
{
this.deptCode = deptCode;
}
public String getDeptCode()
{
return deptCode;
}
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
public String getDeptName()
{
return deptName;
}
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 String getWarehousingInWay() {
return warehousingInWay;
}
public void setWarehousingInWay(String warehousingInWay) {
this.warehousingInWay = warehousingInWay;
}
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("warehousingInfoId", getWarehousingInfoId())
.append("warehousingNumber", getWarehousingNumber())
.append("inNoticeNumber", getInNoticeNumber())
.append("warehousingCategory", getWarehousingCategory())
.append("purchaseOrderNumber", getPurchaseOrderNumber())
.append("contacts", getContacts())
.append("warehousingDate", getWarehousingDate())
.append("supplierCode", getSupplierCode())
.append("supplierName", getSupplierName())
.append("documentPreparationPersonnel", getDocumentPreparationPersonnel())
.append("stockNumber", getStockNumber())
.append("stockName", getStockName())
.append("stockManager", getStockManager())
.append("exportSales", getExportSales())
.append("remarks", getRemarks())
.append("deliveryMan", getDeliveryMan())
.append("returnGoodsNumber", getReturnGoodsNumber())
.append("enterpriseCode", getEnterpriseCode())
.append("enterpriseName", getEnterpriseName())
.append("notificationNumber", getNotificationNumber())
.append("workOrderNumber", getWorkOrderNumber())
.append("deptCode", getDeptCode())
.append("deptName", getDeptName())
.append("firstAddTime", getFirstAddTime())
.append("updateInfoTime", getUpdateInfoTime())
.append("warehousingInWay", getWarehousingInWay())
.append("standbyTwo", getStandbyTwo())
.toString();
}
}

71
ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInInfoMapper.java

@ -1,71 +0,0 @@
package com.ruoyi.storehouse.mapper;
import com.ruoyi.storehouse.domain.WarehousingInInfo;
import java.util.List;
/**
* 入库Mapper接口
*
* @author ruoyi
* @date 2023-04-26
*/
public interface WarehousingInInfoMapper
{
/**
* 查询入库
*
* @param warehousingInfoId 入库ID
* @return 入库
*/
public WarehousingInInfo selectWarehousingInInfoById(Long warehousingInfoId);
/**
* 查询入库列表
*
* @param warehousingInInfo 入库
* @return 入库集合
*/
public List<WarehousingInInfo> selectWarehousingInInfoList(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInRawMaterialByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInSubsidiaryByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInFinishProductByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInRGFinishProductByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInPDFinishProductByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo);
/**
* 新增入库
*
* @param warehousingInInfo 入库
* @return 结果
*/
public int insertWarehousingInInfo(WarehousingInInfo warehousingInInfo);
/**
* 修改入库
*
* @param warehousingInInfo 入库
* @return 结果
*/
public int updateWarehousingInInfo(WarehousingInInfo warehousingInInfo);
/**
* 删除入库
*
* @param warehousingInfoId 入库ID
* @return 结果
*/
public int deleteWarehousingInInfoById(Long warehousingInfoId);
/**
* 批量删除入库
*
* @param warehousingInfoIds 需要删除的数据ID
* @return 结果
*/
public int deleteWarehousingInInfoByIds(String[] warehousingInfoIds);
}

75
ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInInfoService.java

@ -1,75 +0,0 @@
package com.ruoyi.storehouse.service;
import com.ruoyi.storehouse.domain.WarehousingInInfo;
import java.util.List;
/**
* 入库Service接口
*
* @author ruoyi
* @date 2023-04-26
*/
public interface IWarehousingInInfoService
{
/**
* 查询入库
*
* @param warehousingInfoId 入库ID
* @return 入库
*/
public WarehousingInInfo selectWarehousingInInfoById(Long warehousingInfoId);
/**
* 查询入库列表
*
* @param warehousingInInfo 入库
* @return 入库集合
*/
public List<WarehousingInInfo> selectWarehousingInInfoList(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInRawMaterialByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInSubsidiaryByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInFinishProductByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInRGFinishProductByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInPDFinishProductByNumber(WarehousingInInfo warehousingInInfo);
public List<WarehousingInInfo> selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo);
/**
* 新增入库
*
* @param warehousingInInfo 入库
* @return 结果
*/
public int insertWarehousingInInfo(WarehousingInInfo warehousingInInfo);
/**
* 修改入库
*
* @param warehousingInInfo 入库
* @return 结果
*/
public int updateWarehousingInInfo(WarehousingInInfo warehousingInInfo);
/**
* 批量删除入库
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteWarehousingInInfoByIds(String ids);
/**
* 删除入库信息
*
* @param warehousingInfoId 入库ID
* @return 结果
*/
public int deleteWarehousingInInfoById(Long warehousingInfoId);
public String getRawId();
public String getSubsidiaryId();
public String getFinishProductId();
public String getRGFinishProductId();
public String getPDFinishProductId();
public String getPDBcpId();
}

158
ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java

@ -1,158 +0,0 @@
package com.ruoyi.storehouse.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.storehouse.domain.WarehousingInInfo;
import com.ruoyi.storehouse.mapper.WarehousingInInfoMapper;
import com.ruoyi.storehouse.service.IWarehousingInInfoService;
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-26
*/
@Service
public class WarehousingInInfoServiceImpl implements IWarehousingInInfoService
{
@Autowired
private WarehousingInInfoMapper warehousingInInfoMapper;
/**
* 查询入库
*
* @param warehousingInfoId 入库ID
* @return 入库
*/
@Override
public WarehousingInInfo selectWarehousingInInfoById(Long warehousingInfoId)
{
return warehousingInInfoMapper.selectWarehousingInInfoById(warehousingInfoId);
}
/**
* 查询入库列表
*
* @param warehousingInInfo 入库
* @return 入库
*/
@Override
public List<WarehousingInInfo> selectWarehousingInInfoList(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.selectWarehousingInInfoList(warehousingInInfo);
}
@Override
public List<WarehousingInInfo> selectWarehousingInRawMaterialByNumber(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.selectWarehousingInRawMaterialByNumber(warehousingInInfo);
}
@Override
public List<WarehousingInInfo> selectWarehousingInSubsidiaryByNumber(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.selectWarehousingInSubsidiaryByNumber(warehousingInInfo);
}
@Override
public List<WarehousingInInfo> selectWarehousingInFinishProductByNumber(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.selectWarehousingInFinishProductByNumber(warehousingInInfo);
}
@Override
public List<WarehousingInInfo> selectWarehousingInRGFinishProductByNumber(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.selectWarehousingInRGFinishProductByNumber(warehousingInInfo);
}
@Override
public List<WarehousingInInfo> selectWarehousingInPDFinishProductByNumber(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.selectWarehousingInPDFinishProductByNumber(warehousingInInfo);
}
@Override
public List<WarehousingInInfo> selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.selectWarehousingInPDBcpByNumber(warehousingInInfo);
}
/**
* 新增入库
*
* @param warehousingInInfo 入库
* @return 结果
*/
@Override
public int insertWarehousingInInfo(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.insertWarehousingInInfo(warehousingInInfo);
}
/**
* 修改入库
*
* @param warehousingInInfo 入库
* @return 结果
*/
@Override
public int updateWarehousingInInfo(WarehousingInInfo warehousingInInfo)
{
return warehousingInInfoMapper.updateWarehousingInInfo(warehousingInInfo);
}
/**
* 删除入库对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteWarehousingInInfoByIds(String ids)
{
return warehousingInInfoMapper.deleteWarehousingInInfoByIds(Convert.toStrArray(ids));
}
/**
* 删除入库信息
*
* @param warehousingInfoId 入库ID
* @return 结果
*/
@Override
public int deleteWarehousingInInfoById(Long warehousingInfoId)
{
return warehousingInInfoMapper.deleteWarehousingInInfoById(warehousingInfoId);
}
@Override
public String getRawId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "YLIN" + time.substring(2);
}
@Override
public String getSubsidiaryId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "FLIN" + time.substring(2);
}
@Override
public String getFinishProductId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "POCP" + time.substring(2);
}
@Override
public String getRGFinishProductId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "CPRI" + time.substring(2);
}
@Override
public String getPDFinishProductId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "CPIN" + time.substring(2);
}
@Override
public String getPDBcpId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "YLIN" + time.substring(2);
}
}

179
ruoyi-admin/src/main/resources/mapper/manufacture/WarehousingFinishProductNoticeMapper.xml

@ -1,179 +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.manufacture.mapper.WarehousingFinishProductNoticeMapper">
<resultMap type="WarehousingFinishProductNotice" id="WarehousingFinishProductNoticeResult">
<result property="warehousingFinishProductNoticeId" column="warehousing_finish_product_notice_id" />
<result property="notificationNumber" column="notification_number" />
<result property="workOrderNumber" column="work_order_number" />
<result property="enterpriseCode" column="enterprise_code" />
<result property="enterpriseName" column="enterprise_name" />
<result property="deliveryMan" column="delivery_man" />
<result property="stockNumber" column="stock_number" />
<result property="stockName" column="stock_name" />
<result property="stockManager" column="stock_manager" />
<result property="warehousingDate" column="warehousing_date" />
<result property="warehousingType" column="warehousing_type" />
<result property="remarks" column="remarks" />
<result property="finishProductCode" column="finish_product_code" />
<result property="finishProductName" column="finish_product_name" />
<result property="specificationModel" column="specification_model" />
<result property="typeMachine" column="type_machine" />
<result property="inventoryUnit" column="inventory_unit" />
<result property="qualifiedQuantity" column="qualified_quantity" />
<result property="unqualifiedQuantity" column="unqualified_quantity" />
<result property="passRate" column="pass_rate" />
<result property="description" column="description" />
<result property="batchNumber" column="batch_number" />
<result property="confirmFlag" column="confirm_flag" />
<result property="confirmPerson" column="confirm_person" />
<result property="confirmTime" column="confirm_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="selectWarehousingFinishProductNoticeVo">
select warehousing_finish_product_notice_id, notification_number, work_order_number, enterprise_code, enterprise_name, delivery_man, stock_number, stock_name, stock_manager, warehousing_date, warehousing_type, remarks, finish_product_code, finish_product_name, specification_model, type_machine, inventory_unit, qualified_quantity, unqualified_quantity, pass_rate, description, batch_number, confirm_flag, confirm_person, confirm_time, first_add_time, update_info_time, standby_one, standby_two from warehousing_finish_product_notice
</sql>
<select id="selectWarehousingFinishProductNoticeList" parameterType="WarehousingFinishProductNotice" resultMap="WarehousingFinishProductNoticeResult">
<include refid="selectWarehousingFinishProductNoticeVo"/>
<where>
<if test="notificationNumber != null and notificationNumber != ''"> and notification_number like concat('%', #{notificationNumber}, '%')</if>
<if test="workOrderNumber != null and workOrderNumber != ''"> and work_order_number like concat('%', #{workOrderNumber}, '%')</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="stockNumber != null and stockNumber != ''"> and stock_number like concat('%', #{stockNumber}, '%')</if>
<if test="stockName != null and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</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="warehousingType != null and warehousingType != ''"> and warehousing_type = #{warehousingType}</if>
<if test="finishProductCode != null and finishProductCode != ''"> and finish_product_code like concat('%', #{finishProductCode}, '%')</if>
<if test="finishProductName != null and finishProductName != ''"> and finish_product_name like concat('%', #{finishProductName}, '%')</if>
<if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
<if test="confirmFlag != null and confirmFlag != ''"> and confirm_flag = #{confirmFlag}</if>
</where>
</select>
<select id="selectWarehousingFinishProductNoticeById" parameterType="Long" resultMap="WarehousingFinishProductNoticeResult">
<include refid="selectWarehousingFinishProductNoticeVo"/>
where warehousing_finish_product_notice_id = #{warehousingFinishProductNoticeId}
</select>
<insert id="insertWarehousingFinishProductNotice" parameterType="WarehousingFinishProductNotice">
insert into warehousing_finish_product_notice
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="warehousingFinishProductNoticeId != null">warehousing_finish_product_notice_id,</if>
<if test="notificationNumber != null">notification_number,</if>
<if test="workOrderNumber != null">work_order_number,</if>
<if test="enterpriseCode != null">enterprise_code,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="deliveryMan != null">delivery_man,</if>
<if test="stockNumber != null">stock_number,</if>
<if test="stockName != null">stock_name,</if>
<if test="stockManager != null">stock_manager,</if>
<if test="warehousingDate != null">warehousing_date,</if>
<if test="warehousingType != null">warehousing_type,</if>
<if test="remarks != null">remarks,</if>
<if test="finishProductCode != null">finish_product_code,</if>
<if test="finishProductName != null">finish_product_name,</if>
<if test="specificationModel != null">specification_model,</if>
<if test="typeMachine != null">type_machine,</if>
<if test="inventoryUnit != null">inventory_unit,</if>
<if test="qualifiedQuantity != null">qualified_quantity,</if>
<if test="unqualifiedQuantity != null">unqualified_quantity,</if>
<if test="passRate != null">pass_rate,</if>
<if test="description != null">description,</if>
<if test="batchNumber != null">batch_number,</if>
<if test="confirmFlag != null">confirm_flag,</if>
<if test="confirmPerson != null">confirm_person,</if>
<if test="confirmTime != null">confirm_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="warehousingFinishProductNoticeId != null">#{warehousingFinishProductNoticeId},</if>
<if test="notificationNumber != null">#{notificationNumber},</if>
<if test="workOrderNumber != null">#{workOrderNumber},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="deliveryMan != null">#{deliveryMan},</if>
<if test="stockNumber != null">#{stockNumber},</if>
<if test="stockName != null">#{stockName},</if>
<if test="stockManager != null">#{stockManager},</if>
<if test="warehousingDate != null">#{warehousingDate},</if>
<if test="warehousingType != null">#{warehousingType},</if>
<if test="remarks != null">#{remarks},</if>
<if test="finishProductCode != null">#{finishProductCode},</if>
<if test="finishProductName != null">#{finishProductName},</if>
<if test="specificationModel != null">#{specificationModel},</if>
<if test="typeMachine != null">#{typeMachine},</if>
<if test="inventoryUnit != null">#{inventoryUnit},</if>
<if test="qualifiedQuantity != null">#{qualifiedQuantity},</if>
<if test="unqualifiedQuantity != null">#{unqualifiedQuantity},</if>
<if test="passRate != null">#{passRate},</if>
<if test="description != null">#{description},</if>
<if test="batchNumber != null">#{batchNumber},</if>
<if test="confirmFlag != null">#{confirmFlag},</if>
<if test="confirmPerson != null">#{confirmPerson},</if>
<if test="confirmTime != null">#{confirmTime},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
now(),
</trim>
</insert>
<update id="updateWarehousingFinishProductNotice" parameterType="WarehousingFinishProductNotice">
update warehousing_finish_product_notice
<trim prefix="SET" suffixOverrides=",">
<if test="notificationNumber != null">notification_number = #{notificationNumber},</if>
<if test="workOrderNumber != null">work_order_number = #{workOrderNumber},</if>
<if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="deliveryMan != null">delivery_man = #{deliveryMan},</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="warehousingDate != null">warehousing_date = #{warehousingDate},</if>
<if test="warehousingType != null">warehousing_type = #{warehousingType},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="finishProductCode != null">finish_product_code = #{finishProductCode},</if>
<if test="finishProductName != null">finish_product_name = #{finishProductName},</if>
<if test="specificationModel != null">specification_model = #{specificationModel},</if>
<if test="typeMachine != null">type_machine = #{typeMachine},</if>
<if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
<if test="qualifiedQuantity != null">qualified_quantity = #{qualifiedQuantity},</if>
<if test="unqualifiedQuantity != null">unqualified_quantity = #{unqualifiedQuantity},</if>
<if test="passRate != null">pass_rate = #{passRate},</if>
<if test="description != null">description = #{description},</if>
<if test="batchNumber != null">batch_number = #{batchNumber},</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="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 warehousing_finish_product_notice_id = #{warehousingFinishProductNoticeId}
</update>
<delete id="deleteWarehousingFinishProductNoticeById" parameterType="Long">
delete from warehousing_finish_product_notice where warehousing_finish_product_notice_id = #{warehousingFinishProductNoticeId}
</delete>
<delete id="deleteWarehousingFinishProductNoticeByIds" parameterType="String">
delete from warehousing_finish_product_notice where warehousing_finish_product_notice_id in
<foreach item="warehousingFinishProductNoticeId" collection="array" open="(" separator="," close=")">
#{warehousingFinishProductNoticeId}
</foreach>
</delete>
<select id="selectByIdDesc" resultMap="WarehousingFinishProductNoticeResult">
<include refid="selectWarehousingFinishProductNoticeVo"/>
ORDER BY warehousing_finish_product_notice_id DESC
</select>
</mapper>

236
ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInInfoMapper.xml

@ -1,236 +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.storehouse.mapper.WarehousingInInfoMapper">
<resultMap type="WarehousingInInfo" id="WarehousingInInfoResult">
<result property="warehousingInfoId" column="warehousing_info_id" />
<result property="warehousingNumber" column="warehousing_number" />
<result property="inNoticeNumber" column="in_notice_number" />
<result property="warehousingCategory" column="warehousing_category" />
<result property="purchaseOrderNumber" column="purchase_order_number" />
<result property="contacts" column="contacts" />
<result property="warehousingDate" column="warehousing_date" />
<result property="supplierCode" column="supplier_code" />
<result property="supplierName" column="supplier_name" />
<result property="documentPreparationPersonnel" column="document_preparation_personnel" />
<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="remarks" column="remarks" />
<result property="deliveryMan" column="delivery_man" />
<result property="returnGoodsNumber" column="return_goods_number" />
<result property="enterpriseCode" column="enterprise_code" />
<result property="enterpriseName" column="enterprise_name" />
<result property="notificationNumber" column="notification_number" />
<result property="workOrderNumber" column="work_order_number" />
<result property="deptCode" column="dept_code" />
<result property="deptName" column="dept_name" />
<result property="firstAddTime" column="first_add_time" />
<result property="updateInfoTime" column="update_info_time" />
<result property="warehousingInWay" column="warehousing_in_way" />
<result property="standbyTwo" column="standby_two" />
</resultMap>
<sql id="selectWarehousingInInfoVo">
select warehousing_info_id, warehousing_number, in_notice_number, warehousing_category, purchase_order_number, contacts, warehousing_date, supplier_code, supplier_name, document_preparation_personnel, stock_number, stock_name, stock_manager, export_sales, remarks, delivery_man, return_goods_number, enterprise_code, enterprise_name, notification_number, work_order_number, dept_code, dept_name, first_add_time, update_info_time, warehousing_in_way, standby_two from warehousing_in_info
</sql>
<select id="selectWarehousingInInfoList" parameterType="WarehousingInInfo" resultMap="WarehousingInInfoResult">
<include refid="selectWarehousingInInfoVo"/>
<where>
<if test="warehousingNumber != null and warehousingNumber != ''"> and warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
<if test="inNoticeNumber != null and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
<if test="warehousingCategory != null and warehousingCategory != ''"> and warehousing_category = #{warehousingCategory}</if>
<if test="purchaseOrderNumber != null and purchaseOrderNumber != ''"> and purchase_order_number like concat('%', #{purchaseOrderNumber}, '%')</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="stockName != null and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="notificationNumber != null and notificationNumber != ''"> and notification_number like concat('%', #{notificationNumber}, '%')</if>
<if test="workOrderNumber != null and workOrderNumber != ''"> and work_order_number like concat('%', #{workOrderNumber}, '%')</if>
</where>
</select>
<select id="selectWarehousingInInfoById" parameterType="Long" resultMap="WarehousingInInfoResult">
<include refid="selectWarehousingInInfoVo"/>
where warehousing_info_id = #{warehousingInfoId}
</select>
<select id="selectWarehousingInRawMaterialByNumber" parameterType="WarehousingInInfo" resultMap="WarehousingInInfoResult">
<include refid="selectWarehousingInInfoVo"/>
where warehousing_number like '%YLIN%' AND warehousing_in_way = '原料入库'
<if test="warehousingNumber != null and warehousingNumber != ''"> and warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
<if test="inNoticeNumber != null and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
<if test="warehousingCategory != null and warehousingCategory != ''"> and warehousing_category = #{warehousingCategory}</if>
<if test="purchaseOrderNumber != null and purchaseOrderNumber != ''"> and purchase_order_number like concat('%', #{purchaseOrderNumber}, '%')</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="stockName != null and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
<if test="exportSales != null and exportSales != ''"> and export_sales = #{exportSales}</if>
</select>
<select id="selectWarehousingInSubsidiaryByNumber" parameterType="WarehousingInInfo" resultMap="WarehousingInInfoResult">
<include refid="selectWarehousingInInfoVo"/>
where warehousing_number like '%FLIN%'
<if test="warehousingNumber != null and warehousingNumber != ''"> and warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
<if test="inNoticeNumber != null and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
<if test="warehousingCategory != null and warehousingCategory != ''"> and warehousing_category = #{warehousingCategory}</if>
<if test="purchaseOrderNumber != null and purchaseOrderNumber != ''"> and purchase_order_number like concat('%', #{purchaseOrderNumber}, '%')</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="stockName != null and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
<if test="exportSales != null and exportSales != ''"> and export_sales = #{exportSales}</if>
</select>
<select id="selectWarehousingInFinishProductByNumber" parameterType="WarehousingInInfo" resultMap="WarehousingInInfoResult">
<include refid="selectWarehousingInInfoVo"/>
where warehousing_number like '%POCP%'
<if test="warehousingNumber != null and warehousingNumber != ''"> and warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
<if test="inNoticeNumber != null and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
<if test="warehousingCategory != null and warehousingCategory != ''"> and warehousing_category = #{warehousingCategory}</if>
<if test="purchaseOrderNumber != null and purchaseOrderNumber != ''"> and purchase_order_number like concat('%', #{purchaseOrderNumber}, '%')</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="stockName != null and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
<if test="exportSales != null and exportSales != ''"> and export_sales = #{exportSales}</if>
</select>
<select id="selectWarehousingInRGFinishProductByNumber" parameterType="WarehousingInInfo" resultMap="WarehousingInInfoResult">
<include refid="selectWarehousingInInfoVo"/>
where warehousing_number like '%CPRI%'
<if test="warehousingNumber != null and warehousingNumber != ''"> and warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
<if test="inNoticeNumber != null and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
<if test="warehousingCategory != null and warehousingCategory != ''"> and warehousing_category = #{warehousingCategory}</if>
<if test="purchaseOrderNumber != null and purchaseOrderNumber != ''"> and purchase_order_number like concat('%', #{purchaseOrderNumber}, '%')</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="stockName != null and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
<if test="exportSales != null and exportSales != ''"> and export_sales = #{exportSales}</if>
</select>
<select id="selectWarehousingInPDFinishProductByNumber" parameterType="WarehousingInInfo" resultMap="WarehousingInInfoResult">
<include refid="selectWarehousingInInfoVo"/>
where warehousing_number like '%CPIN%'
<if test="warehousingNumber != null and warehousingNumber != ''"> and warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
<if test="inNoticeNumber != null and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
<if test="warehousingCategory != null and warehousingCategory != ''"> and warehousing_category = #{warehousingCategory}</if>
<if test="purchaseOrderNumber != null and purchaseOrderNumber != ''"> and purchase_order_number like concat('%', #{purchaseOrderNumber}, '%')</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="stockName != null and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
<if test="exportSales != null and exportSales != ''"> and export_sales = #{exportSales}</if>
</select>
<select id="selectWarehousingInPDBcpByNumber" parameterType="WarehousingInInfo" resultMap="WarehousingInInfoResult">
<include refid="selectWarehousingInInfoVo"/>
where warehousing_number like '%YLIN%' AND warehousing_in_way = '半成品生产入库'
<if test="warehousingNumber != null and warehousingNumber != ''"> and warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
<if test="inNoticeNumber != null and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
<if test="warehousingCategory != null and warehousingCategory != ''"> and warehousing_category = #{warehousingCategory}</if>
<if test="purchaseOrderNumber != null and purchaseOrderNumber != ''"> and purchase_order_number like concat('%', #{purchaseOrderNumber}, '%')</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="stockName != null and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
<if test="exportSales != null and exportSales != ''"> and export_sales = #{exportSales}</if>
</select>
<insert id="insertWarehousingInInfo" parameterType="WarehousingInInfo" useGeneratedKeys="true" keyProperty="warehousingInfoId">
insert into warehousing_in_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="warehousingNumber != null and warehousingNumber != ''">warehousing_number,</if>
<if test="inNoticeNumber != null">in_notice_number,</if>
<if test="warehousingCategory != null">warehousing_category,</if>
<if test="purchaseOrderNumber != null">purchase_order_number,</if>
<if test="contacts != null">contacts,</if>
<if test="warehousingDate != null">warehousing_date,</if>
<if test="supplierCode != null">supplier_code,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="documentPreparationPersonnel != null">document_preparation_personnel,</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="remarks != null">remarks,</if>
<if test="deliveryMan != null">delivery_man,</if>
<if test="returnGoodsNumber != null">return_goods_number,</if>
<if test="enterpriseCode != null">enterprise_code,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="notificationNumber != null">notification_number,</if>
<if test="workOrderNumber != null">work_order_number,</if>
<if test="deptCode != null">dept_code,</if>
<if test="deptName != null">dept_name,</if>
<if test="warehousingInWay != null">warehousing_in_way,</if>
<if test="standbyTwo != null">standby_two,</if>
first_add_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="warehousingNumber != null and warehousingNumber != ''">#{warehousingNumber},</if>
<if test="inNoticeNumber != null">#{inNoticeNumber},</if>
<if test="warehousingCategory != null">#{warehousingCategory},</if>
<if test="purchaseOrderNumber != null">#{purchaseOrderNumber},</if>
<if test="contacts != null">#{contacts},</if>
<if test="warehousingDate != null">#{warehousingDate},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="documentPreparationPersonnel != null">#{documentPreparationPersonnel},</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="remarks != null">#{remarks},</if>
<if test="deliveryMan != null">#{deliveryMan},</if>
<if test="returnGoodsNumber != null">#{returnGoodsNumber},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="notificationNumber != null">#{notificationNumber},</if>
<if test="workOrderNumber != null">#{workOrderNumber},</if>
<if test="deptCode != null">#{deptCode},</if>
<if test="deptName != null">#{deptName},</if>
<if test="warehousingInWay != null">#{warehousingInWay},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
now(),
</trim>
</insert>
<update id="updateWarehousingInInfo" parameterType="WarehousingInInfo">
update warehousing_in_info
<trim prefix="SET" suffixOverrides=",">
<if test="warehousingNumber != null and warehousingNumber != ''">warehousing_number = #{warehousingNumber},</if>
<if test="inNoticeNumber != null">in_notice_number = #{inNoticeNumber},</if>
<if test="warehousingCategory != null">warehousing_category = #{warehousingCategory},</if>
<if test="purchaseOrderNumber != null">purchase_order_number = #{purchaseOrderNumber},</if>
<if test="contacts != null">contacts = #{contacts},</if>
<if test="warehousingDate != null">warehousing_date = #{warehousingDate},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="documentPreparationPersonnel != null">document_preparation_personnel = #{documentPreparationPersonnel},</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="remarks != null">remarks = #{remarks},</if>
<if test="deliveryMan != null">delivery_man = #{deliveryMan},</if>
<if test="returnGoodsNumber != null">return_goods_number = #{returnGoodsNumber},</if>
<if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="notificationNumber != null">notification_number = #{notificationNumber},</if>
<if test="workOrderNumber != null">work_order_number = #{workOrderNumber},</if>
<if test="deptCode != null">dept_code = #{deptCode},</if>
<if test="deptName != null">dept_name = #{deptName},</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 warehousing_info_id = #{warehousingInfoId}
</update>
<delete id="deleteWarehousingInInfoById" parameterType="Long">
delete from warehousing_in_info where warehousing_info_id = #{warehousingInfoId}
</delete>
<delete id="deleteWarehousingInInfoByIds" parameterType="String">
delete from warehousing_in_info where warehousing_info_id in
<foreach item="warehousingInfoId" collection="array" open="(" separator="," close=")">
#{warehousingInfoId}
</foreach>
</delete>
</mapper>

264
ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/add.html

@ -1,264 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增成品入库通知')" />
<th:block th:include="include :: datetimepicker-css" />
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-warehousingFinishProductNotice-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">通知单号:</label>
<div class="col-sm-8">
<input name="notificationNumber" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">工单号:</label>
<div class="col-sm-8">
<!-- <input name="workOrderNumber" class="form-control" type="text">-->
<select name="workOrderNumber" class="form-control m-b" type="text" required>
<option value="">请选择工单号</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<input name="enterpriseCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<input name="enterpriseName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">送货人:</label>
<div class="col-sm-8">
<input name="deliveryMan" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库号:</label>
<div class="col-sm-8">
<input name="stockNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库名称:</label>
<div class="col-sm-8">
<!-- <input name="stockName" class="form-control" type="text">-->
<select name="stockName" class="form-control m-b">
<option value="">请选择仓库名称</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库管理员:</label>
<div class="col-sm-8">
<input name="stockManager" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库日期:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="warehousingDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库类型:</label>
<div class="col-sm-8">
<select name="warehousingType" class="form-control m-b" th:with="type=${@dict.getType('warehousing_category')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remarks" class="form-control" type="text"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成品代码:</label>
<div class="col-sm-8">
<input name="finishProductCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成品名称:</label>
<div class="col-sm-8">
<input name="finishProductName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">规格型号:</label>
<div class="col-sm-8">
<input name="specificationModel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">机种:</label>
<div class="col-sm-8">
<input name="typeMachine" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<input name="inventoryUnit" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">合格数量:</label>
<div class="col-sm-8">
<input name="qualifiedQuantity" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">不合格数量:</label>
<div class="col-sm-8">
<input name="unqualifiedQuantity" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">合格率:</label>
<div class="col-sm-8">
<input name="passRate" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">说明:</label>
<div class="col-sm-8">
<textarea name="description" class="form-control" type="text"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">生产批号:</label>
<div class="col-sm-8">
<input name="batchNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group hidden">
<label class="col-sm-3 control-label">确认否:</label>
<div class="col-sm-8">
<!-- <input name="closeCaseFlag" class="form-control" type="text">-->
<select name="confirmFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: select2-js"/>
<script th:inline="javascript">
var prefix = ctx + "manufacture/warehousingFinishProductNotice"
var prefixWorkOrder = ctx + "manufacture/workOrderInfo"
$("#form-warehousingFinishProductNotice-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-warehousingFinishProductNotice-add').serialize());
}
}
$("input[name='warehousingDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true,
todayBtn: true
});
$("input[name='warehousingDate']").datetimepicker('setDate', new Date())
//获取单号
$.ajax({
url: prefix + "/id",
type: "post",
dateType: "json",
success: function (resp) {
if (resp.code === 0) {
$("input[name='notificationNumber']").val(resp.data);
} else {
$.modal.msgError("失败啦");
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
});
//默认入库类型为“成品入库”
$("#form-warehousingFinishProductNotice-add select[name='warehousingType']").val(1).trigger("change")
//工单号
$.ajax({
url: prefixWorkOrder + '/list',
type: "post",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
let orderData = res.rows;
for (let i in orderData) {
$("#form-warehousingFinishProductNotice-add select[name='workOrderNumber']").append("<option value='" + orderData[i].workOrderNumber + "'>" + orderData[i].workOrderNumber + "</option>");
$("#form-warehousingFinishProductNotice-add select[name='workOrderNumber']").change(function () {
var workOrderNumber = $(this).val();
for (let i=0;i<orderData.length;i++) {
if (orderData[i].workOrderNumber == workOrderNumber) {
$("#form-warehousingFinishProductNotice-add input[name='enterpriseCode']").val(orderData[i].enterpriseCode);
$("#form-warehousingFinishProductNotice-add input[name='enterpriseName']").val(orderData[i].enterpriseName);
$("#form-warehousingFinishProductNotice-add input[name='finishProductCode']").val(orderData[i].finishProductCode);
$("#form-warehousingFinishProductNotice-add input[name='finishProductName']").val(orderData[i].finishProductName);
$("#form-warehousingFinishProductNotice-add input[name='specificationModel']").val(orderData[i].specificationModel);
$("#form-warehousingFinishProductNotice-add input[name='typeMachine']").val(orderData[i].typeMachine);
$("#form-warehousingFinishProductNotice-add input[name='inventoryUnit']").val(orderData[i].inventoryUnit);
$("#form-warehousingFinishProductNotice-add textarea[name='description']").val(orderData[i].salesExplain);
$("#form-warehousingFinishProductNotice-add input[name='batchNumber']").val(orderData[i].workOrderNumber);
}
}
})
}
}
}
})
//获取仓库信息
$.ajax({
url: ctx + "stock/stockInfo/list",
type: "post",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
let stockData = res.rows;
for (let i in stockData) {
// console.log(finishProductData[i].finishProductCode)
$("#form-warehousingFinishProductNotice-add select[name='stockName']").append("<option value='" + stockData[i].stockname + "'>" + stockData[i].stockname + "</option>");
$("#form-warehousingFinishProductNotice-add select[name='stockName']").change(function () {
var stockName = $(this).val();
for (let i=0;i<stockData.length;i++) {
if (stockData[i].stockname == stockName) {
$("#form-warehousingFinishProductNotice-add input[name='stockNumber']").val(stockData[i].stockNO);
$("#form-warehousingFinishProductNotice-add input[name='stockManager']").val(stockData[i].stockmanager);
}
}
})
}
}
}
})
</script>
</body>
</html>

240
ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/edit.html

@ -1,240 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改成品入库通知')" />
<th:block th:include="include :: datetimepicker-css" />
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-warehousingFinishProductNotice-edit" th:object="${warehousingFinishProductNotice}">
<input name="warehousingFinishProductNoticeId" th:field="*{warehousingFinishProductNoticeId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">通知单号:</label>
<div class="col-sm-8">
<input name="notificationNumber" th:field="*{notificationNumber}" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工单号:</label>
<div class="col-sm-8">
<!-- <input name="workOrderNumber" th:field="*{workOrderNumber}" class="form-control" type="text">-->
<select name="workOrderNumber" class="form-control m-b" type="text">
<option value="">请选择工单号</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">送货人:</label>
<div class="col-sm-8">
<input name="deliveryMan" th:field="*{deliveryMan}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库号:</label>
<div class="col-sm-8">
<input name="stockNumber" th:field="*{stockNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库名称:</label>
<div class="col-sm-8">
<!-- <input name="stockName" th:field="*{stockName}" class="form-control" type="text">-->
<select name="stockName" class="form-control m-b">
<option value="">请选择仓库名称</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库管理员:</label>
<div class="col-sm-8">
<input name="stockManager" th:field="*{stockManager}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库日期:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="warehousingDate" th:field="*{warehousingDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库类型:</label>
<div class="col-sm-8">
<select name="warehousingType" class="form-control m-b" th:with="type=${@dict.getType('warehousing_category')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehousingType}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remarks" th:field="*{remarks}" class="form-control" type="text"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成品代码:</label>
<div class="col-sm-8">
<input name="finishProductCode" th:field="*{finishProductCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成品名称:</label>
<div class="col-sm-8">
<input name="finishProductName" th:field="*{finishProductName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">规格型号:</label>
<div class="col-sm-8">
<input name="specificationModel" th:field="*{specificationModel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">机种:</label>
<div class="col-sm-8">
<input name="typeMachine" th:field="*{typeMachine}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<input name="inventoryUnit" th:field="*{inventoryUnit}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">合格数量:</label>
<div class="col-sm-8">
<input name="qualifiedQuantity" th:field="*{qualifiedQuantity}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">不合格数量:</label>
<div class="col-sm-8">
<input name="unqualifiedQuantity" th:field="*{unqualifiedQuantity}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">合格率:</label>
<div class="col-sm-8">
<input name="passRate" th:field="*{passRate}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">说明:</label>
<div class="col-sm-8">
<textarea name="description" th:field="*{description}" class="form-control" type="text"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">生产批号:</label>
<div class="col-sm-8">
<input name="batchNumber" th:field="*{batchNumber}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: select2-js"/>
<script th:inline="javascript">
var getData = [[${warehousingFinishProductNotice}]]
var prefix = ctx + "manufacture/warehousingFinishProductNotice";
var prefixWorkOrder = ctx + "manufacture/workOrderInfo"
$("#form-warehousingFinishProductNotice-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-warehousingFinishProductNotice-edit').serialize());
}
}
$("input[name='warehousingDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true,
todayBtn: true
});
//工单号
$.ajax({
url: prefixWorkOrder + '/list',
type: "post",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
let orderData = res.rows;
for (let i in orderData) {
$("#form-warehousingFinishProductNotice-edit select[name='workOrderNumber']").append("<option value='" + orderData[i].workOrderNumber + "'>" + orderData[i].workOrderNumber + "</option>");
}
console.log(getData.workOrderNumber)
$("#form-warehousingFinishProductNotice-edit select[name='workOrderNumber']").val(getData.workOrderNumber).trigger("change")
$("#form-warehousingFinishProductNotice-edit select[name='workOrderNumber']").change(function () {
var workOrderNumber = $(this).val();
for (let i=0;i<orderData.length;i++) {
if (orderData[i].workOrderNumber == workOrderNumber) {
$("#form-warehousingFinishProductNotice-edit input[name='enterpriseCode']").val(orderData[i].enterpriseCode);
$("#form-warehousingFinishProductNotice-edit input[name='enterpriseName']").val(orderData[i].enterpriseName);
$("#form-warehousingFinishProductNotice-edit input[name='finishProductCode']").val(orderData[i].finishProductCode);
$("#form-warehousingFinishProductNotice-edit input[name='finishProductName']").val(orderData[i].finishProductName);
$("#form-warehousingFinishProductNotice-edit input[name='specificationModel']").val(orderData[i].specificationModel);
$("#form-warehousingFinishProductNotice-edit input[name='typeMachine']").val(orderData[i].typeMachine);
$("#form-warehousingFinishProductNotice-edit input[name='inventoryUnit']").val(orderData[i].inventoryUnit);
$("#form-warehousingFinishProductNotice-edit textarea[name='description']").val(orderData[i].salesExplain);
$("#form-warehousingFinishProductNotice-edit input[name='batchNumber']").val(orderData[i].workOrderNumber);
}
}
})
}
}
})
//获取仓库信息
$.ajax({
url: ctx + "stock/stockInfo/list",
type: "post",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
let stockData = res.rows;
for (let i in stockData) {
// console.log(finishProductData[i].finishProductCode)
$("#form-warehousingFinishProductNotice-edit select[name='stockName']").append("<option value='" + stockData[i].stockname + "'>" + stockData[i].stockname + "</option>");
}
$("#form-warehousingFinishProductNotice-edit select[name='stockName']").val(getData.stockName).trigger("change")
$("#form-warehousingFinishProductNotice-edit select[name='stockName']").change(function () {
var stockName = $(this).val();
for (let i=0;i<stockData.length;i++) {
if (stockData[i].stockname == stockName) {
$("#form-warehousingFinishProductNotice-edit input[name='stockNumber']").val(stockData[i].stockNO);
$("#form-warehousingFinishProductNotice-edit input[name='stockManager']").val(stockData[i].stockmanager);
}
}
})
}
}
})
</script>
</body>
</html>

343
ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/warehousingFinishProductNotice.html

@ -1,343 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('成品入库通知列表')" />
<th:block th:include="include :: datetimepicker-css"/>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>通知单号:</label>
<input type="text" name="notificationNumber"/>
</li>
<li>
<label>工单号:</label>
<input type="text" name="workOrderNumber"/>
</li>
<li>
<label>客户代码:</label>
<input type="text" name="enterpriseCode"/>
</li>
<li>
<label>客户名称:</label>
<input type="text" name="enterpriseName"/>
</li>
<li>
<label>仓库号:</label>
<input type="text" name="stockNumber"/>
</li>
<li>
<label>仓库名称:</label>
<input type="text" name="stockName"/>
</li>
<li class="select-time">
<label>入库日期:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginWarehousingDate]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endWarehousingDate]"/>
</li>
<li>
<label>入库类型:</label>
<select name="warehousingType" th:with="type=${@dict.getType('warehousing_category')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>成品代码:</label>
<input type="text" name="finishProductCode"/>
</li>
<li>
<label>成品名称:</label>
<input type="text" name="finishProductName"/>
</li>
<li>
<label>批号:</label>
<input type="text" name="batchNumber"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manufacture:warehousingFinishProductNotice:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manufacture:warehousingFinishProductNotice:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manufacture:warehousingFinishProductNotice:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manufacture:warehousingFinishProductNotice:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-primary" onclick="reviewConfirm()" shiro:hasPermission="manufacture:warehousingFinishProductNotice:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" style="white-space: nowrap"></table>
</div>
</div>
</div>
<!--订单确认-->
<div class="modal fade" id="confirmModel">
<div class="modal-dialog">
<div class="modal-content message_align">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">确认信息</h4>
</div>
<div class="modal-body" style="height: 180px">
<form id="form-confirm-edit">
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">成品入库通知id:</label>
<div class="col-sm-8">
<input name="warehousingFinishProductNoticeId" class="form-control" type="text" required
readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">确认否:</label>
<div class="col-sm-8">
<select id="confirmFlag" name="confirmFlag" class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">确认日期:</label>
<div class="col-sm-8">
<div class="input-group date">
<input id="confirmTime" name="confirmTime" class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">确认人:</label>
<div class="col-sm-8">
<input id="confirmPerson" name="confirmPerson" class="form-control" type="text">
</div>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
<button type="button" onclick="confirmSubmit()" class="btn btn-success" data-dismiss="modal">确定</button>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js"/>
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('manufacture:warehousingFinishProductNotice:edit')}]];
var removeFlag = [[${@permission.hasPermi('manufacture:warehousingFinishProductNotice:remove')}]];
var warehousingTypeDatas = [[${@dict.getType('warehousing_category')}]];
var confirmNoDatas = [[${@dict.getType('sys_whether')}]];
var prefix = ctx + "manufacture/warehousingFinishProductNotice";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
clickToSelect: true,
modalName: "成品入库通知",
columns: [{
checkbox: true
},
{
field: 'warehousingFinishProductNoticeId',
title: '成品入库通知id',
visible: false
},
{
field: 'confirmFlag',
title: '确认否',
formatter: function(value, row, index) {
// return $.table.selectDictLabel(confirmNoDatas, value);
var actions = [];
if ($.table.selectDictLabel(confirmNoDatas, value) == "<span class=''></span>") {
actions.push('<a class="btn btn-primary btn-xs disabled">已确认</a> ');
} else {
actions.push('<a class="btn btn-danger btn-xs disabled">未确认</a> ');
}
return actions.join('');
}
},
{
field: 'notificationNumber',
title: '通知单号'
},
{
field: 'workOrderNumber',
title: '工单号'
},
{
field: 'enterpriseCode',
title: '客户代码'
},
{
field: 'enterpriseName',
title: '客户名称'
},
{
field: 'deliveryMan',
title: '送货人'
},
{
field: 'stockNumber',
title: '仓库号'
},
{
field: 'stockName',
title: '仓库名称'
},
{
field: 'stockManager',
title: '仓库管理员'
},
{
field: 'warehousingDate',
title: '入库日期'
},
{
field: 'warehousingType',
title: '入库类型',
formatter: function(value, row, index) {
return $.table.selectDictLabel(warehousingTypeDatas, value);
}
},
{
field: 'remarks',
title: '备注'
},
{
field: 'finishProductCode',
title: '成品代码'
},
{
field: 'finishProductName',
title: '成品名称'
},
{
field: 'specificationModel',
title: '规格型号'
},
{
field: 'typeMachine',
title: '机种'
},
{
field: 'inventoryUnit',
title: '单位'
},
{
field: 'qualifiedQuantity',
title: '合格数量'
},
{
field: 'unqualifiedQuantity',
title: '不合格数量'
},
{
field: 'passRate',
title: '合格率'
},
{
field: 'description',
title: '说明'
},
{
field: 'batchNumber',
title: '批号'
},
{
field: 'confirmPerson',
title: '确认人'
},
{
field: 'confirmTime',
title: '确认时间'
},
{
field: 'firstAddTime',
title: '录入时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
return value;
}
}
},
{
field: 'updateInfoTime',
title: '上次修改时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
var vArr = value.split(',')
return vArr[0];
}
}
}]
};
$.table.init(options);
});
// 确认
function reviewConfirm(){
let data = $("#bootstrap-table").bootstrapTable("getSelections");
let userName = [[${@permission.getPrincipalProperty('userName')}]];
if (data.length ===1) {
$("#form-confirm-edit input[name='warehousingFinishProductNoticeId']").val(data[0].warehousingFinishProductNoticeId)
$("#confirmFlag").val(data[0].confirmFlag).trigger("change")
$("#confirmPerson").val(userName)
$("#confirmTime").datetimepicker("setDate", new Date());
$("#confirmModel").modal("show");
}else {
$.modal.alert("请选择一条数据");
}
}
// 确认
function confirmSubmit(){
$.ajax({
url: prefix + "/edit",
type: "post",
resultType: "json",
data: $('#form-confirm-edit').serialize(),
success: function (resp) {
// console.log(resp)
$("#confirmModel").modal("hide");
$("#bootstrap-table").bootstrapTable('refresh');
$.modal.msgSuccess("操作成功!")
},
error: function () {
$.modal.msgError("出错了!");
}
});
}
</script>
</body>
</html>

166
ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/add.html

@ -1,166 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增入库')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-warehousingInInfo-add">
<div class="form-group">
<label class="col-sm-3 control-label">暂收单号:</label>
<div class="col-sm-8">
<input name="inNoticeNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库类型:</label>
<div class="col-sm-8">
<select name="warehousingCategory" class="form-control m-b" th:with="type=${@dict.getType('warehousing_category')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">采购订单号:</label>
<div class="col-sm-8">
<input name="purchaseOrderNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">联系人:</label>
<div class="col-sm-8">
<input name="contacts" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库日期:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="warehousingDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">供应商代码:</label>
<div class="col-sm-8">
<input name="supplierCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">供应商名称:</label>
<div class="col-sm-8">
<input name="supplierName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">制单人员:</label>
<div class="col-sm-8">
<input name="documentPreparationPersonnel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库号:</label>
<div class="col-sm-8">
<input name="stockNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库名称:</label>
<div class="col-sm-8">
<input name="stockName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库管理员:</label>
<div class="col-sm-8">
<input name="stockManager" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">内外销:</label>
<div class="col-sm-8">
<select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remarks" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">送货人:</label>
<div class="col-sm-8">
<input name="deliveryMan" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">退货单号:</label>
<div class="col-sm-8">
<input name="returnGoodsNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<input name="enterpriseCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<input name="enterpriseName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库通知单号:</label>
<div class="col-sm-8">
<input name="notificationNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工单号:</label>
<div class="col-sm-8">
<input name="workOrderNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门编号:</label>
<div class="col-sm-8">
<input name="deptCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门名称:</label>
<div class="col-sm-8">
<input name="deptName" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "storehouse/warehousingInInfo"
$("#form-warehousingInInfo-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-warehousingInInfo-add').serialize());
}
}
$("input[name='warehousingDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

167
ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/edit.html

@ -1,167 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改入库')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-warehousingInInfo-edit" th:object="${warehousingInInfo}">
<input name="warehousingInfoId" th:field="*{warehousingInfoId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">暂收单号:</label>
<div class="col-sm-8">
<input name="inNoticeNumber" th:field="*{inNoticeNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库类型:</label>
<div class="col-sm-8">
<select name="warehousingCategory" class="form-control m-b" th:with="type=${@dict.getType('warehousing_category')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehousingCategory}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">采购订单号:</label>
<div class="col-sm-8">
<input name="purchaseOrderNumber" th:field="*{purchaseOrderNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">联系人:</label>
<div class="col-sm-8">
<input name="contacts" th:field="*{contacts}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库日期:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="warehousingDate" th:value="${#dates.format(warehousingInInfo.warehousingDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">供应商代码:</label>
<div class="col-sm-8">
<input name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">供应商名称:</label>
<div class="col-sm-8">
<input name="supplierName" th:field="*{supplierName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">制单人员:</label>
<div class="col-sm-8">
<input name="documentPreparationPersonnel" th:field="*{documentPreparationPersonnel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库号:</label>
<div class="col-sm-8">
<input name="stockNumber" th:field="*{stockNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库名称:</label>
<div class="col-sm-8">
<input name="stockName" th:field="*{stockName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">仓库管理员:</label>
<div class="col-sm-8">
<input name="stockManager" th:field="*{stockManager}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">内外销:</label>
<div class="col-sm-8">
<select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{exportSales}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remarks" class="form-control">[[*{remarks}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">送货人:</label>
<div class="col-sm-8">
<input name="deliveryMan" th:field="*{deliveryMan}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">退货单号:</label>
<div class="col-sm-8">
<input name="returnGoodsNumber" th:field="*{returnGoodsNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库通知单号:</label>
<div class="col-sm-8">
<input name="notificationNumber" th:field="*{notificationNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工单号:</label>
<div class="col-sm-8">
<input name="workOrderNumber" th:field="*{workOrderNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门编号:</label>
<div class="col-sm-8">
<input name="deptCode" th:field="*{deptCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门名称:</label>
<div class="col-sm-8">
<input name="deptName" th:field="*{deptName}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "storehouse/warehousingInInfo";
$("#form-warehousingInInfo-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-warehousingInInfo-edit').serialize());
}
}
$("input[name='warehousingDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

220
ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/warehousingInInfo.html

@ -1,220 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('入库列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>入库单号:</label>
<input type="text" name="warehousingNumber"/>
</li>
<li>
<label>暂收单号:</label>
<input type="text" name="inNoticeNumber"/>
</li>
<li>
<label>入库类型:</label>
<select name="warehousingCategory" th:with="type=${@dict.getType('warehousing_category')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>采购订单号:</label>
<input type="text" name="purchaseOrderNumber"/>
</li>
<li class="select-time">
<label>入库日期:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginWarehousingDate]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endWarehousingDate]"/>
</li>
<li>
<label>仓库名称:</label>
<input type="text" name="stockName"/>
</li>
<li>
<label>客户代码:</label>
<input type="text" name="enterpriseCode"/>
</li>
<li>
<label>客户名称:</label>
<input type="text" name="enterpriseName"/>
</li>
<li>
<label>入库通知单号:</label>
<input type="text" name="notificationNumber"/>
</li>
<li>
<label>工单号:</label>
<input type="text" name="workOrderNumber"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="storehouse:warehousingInInfo:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:warehousingInInfo:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:warehousingInInfo:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:warehousingInInfo:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('storehouse:warehousingInInfo:edit')}]];
var removeFlag = [[${@permission.hasPermi('storehouse:warehousingInInfo:remove')}]];
var warehousingCategoryDatas = [[${@dict.getType('warehousing_category')}]];
var exportSalesDatas = [[${@dict.getType('sys_export_sales')}]];
var prefix = ctx + "storehouse/warehousingInInfo";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "入库",
columns: [{
checkbox: true
},
{
field: 'warehousingInfoId',
title: '入库id',
visible: false
},
{
field: 'warehousingNumber',
title: '入库单号',
visible: false
},
{
field: 'inNoticeNumber',
title: '暂收单号'
},
{
field: 'warehousingCategory',
title: '入库类型',
formatter: function(value, row, index) {
return $.table.selectDictLabel(warehousingCategoryDatas, value);
}
},
{
field: 'purchaseOrderNumber',
title: '采购订单号'
},
{
field: 'contacts',
title: '联系人'
},
{
field: 'warehousingDate',
title: '入库日期'
},
{
field: 'supplierCode',
title: '供应商代码'
},
{
field: 'supplierName',
title: '供应商名称'
},
{
field: 'documentPreparationPersonnel',
title: '制单人员'
},
{
field: 'stockNumber',
title: '仓库号'
},
{
field: 'stockName',
title: '仓库名称'
},
{
field: 'stockManager',
title: '仓库管理员'
},
{
field: 'exportSales',
title: '内外销',
formatter: function(value, row, index) {
return $.table.selectDictLabel(exportSalesDatas, value);
}
},
{
field: 'remarks',
title: '备注'
},
{
field: 'deliveryMan',
title: '送货人'
},
{
field: 'returnGoodsNumber',
title: '退货单号'
},
{
field: 'enterpriseCode',
title: '客户代码'
},
{
field: 'enterpriseName',
title: '客户名称'
},
{
field: 'notificationNumber',
title: '入库通知单号'
},
{
field: 'workOrderNumber',
title: '工单号'
},
{
field: 'deptCode',
title: '部门编号'
},
{
field: 'deptName',
title: '部门名称'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.warehousingInfoId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.warehousingInfoId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>
Loading…
Cancel
Save