zhangsiqi
11 months ago
46 changed files with 4306 additions and 227 deletions
@ -0,0 +1,148 @@ |
|||
package com.ruoyi.system.controller; |
|||
|
|||
import com.ruoyi.common.annotation.Log; |
|||
import com.ruoyi.common.core.controller.BaseController; |
|||
import com.ruoyi.common.core.domain.AjaxResult; |
|||
import com.ruoyi.common.core.page.TableDataInfo; |
|||
import com.ruoyi.common.enums.BusinessType; |
|||
import com.ruoyi.common.utils.poi.ExcelUtil; |
|||
import com.ruoyi.system.domain.SysMakeOrder; |
|||
import com.ruoyi.system.service.ISysMakeOrderService; |
|||
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 zhang |
|||
* @date 2023-12-18 |
|||
*/ |
|||
@Controller |
|||
@RequestMapping("/system/makeorder") |
|||
public class SysMakeOrderController extends BaseController |
|||
{ |
|||
private String prefix = "system/makeorder"; |
|||
|
|||
@Autowired |
|||
private ISysMakeOrderService sysMakeOrderService; |
|||
|
|||
@RequiresPermissions("system:makeorder:view") |
|||
@GetMapping() |
|||
public String makeorder() |
|||
{ |
|||
return prefix + "/makeorder"; |
|||
} |
|||
|
|||
/** |
|||
* 查询生产订单列表 |
|||
*/ |
|||
@RequiresPermissions("system:makeorder:list") |
|||
@PostMapping("/list") |
|||
@ResponseBody |
|||
public TableDataInfo list(SysMakeOrder sysMakeOrder) |
|||
{ |
|||
startPage(); |
|||
List<SysMakeOrder> list = sysMakeOrderService.selectSysMakeOrderList(sysMakeOrder); |
|||
return getDataTable(list); |
|||
} |
|||
|
|||
/** |
|||
* 导出生产订单列表 |
|||
*/ |
|||
@RequiresPermissions("system:makeorder:export") |
|||
@Log(title = "生产订单", businessType = BusinessType.EXPORT) |
|||
@PostMapping("/export") |
|||
@ResponseBody |
|||
public AjaxResult export(SysMakeOrder sysMakeOrder) |
|||
{ |
|||
List<SysMakeOrder> list = sysMakeOrderService.selectSysMakeOrderList(sysMakeOrder); |
|||
ExcelUtil<SysMakeOrder> util = new ExcelUtil<SysMakeOrder>(SysMakeOrder.class); |
|||
return util.exportExcel(list, "生产订单数据"); |
|||
} |
|||
|
|||
/** |
|||
* 新增生产订单 |
|||
*/ |
|||
@GetMapping("/add") |
|||
public String add() |
|||
{ |
|||
return prefix + "/add"; |
|||
} |
|||
|
|||
/** |
|||
* 新增保存生产订单 |
|||
*/ |
|||
@RequiresPermissions("system:makeorder:add") |
|||
@Log(title = "生产订单", businessType = BusinessType.INSERT) |
|||
@PostMapping("/add") |
|||
@ResponseBody |
|||
public AjaxResult addSave(SysMakeOrder sysMakeOrder) |
|||
{ |
|||
return toAjax(sysMakeOrderService.insertSysMakeOrder(sysMakeOrder)); |
|||
} |
|||
|
|||
/** |
|||
* 修改生产订单 |
|||
*/ |
|||
@GetMapping("/edit/{id}") |
|||
public String edit(@PathVariable("id") Long id, ModelMap mmap) |
|||
{ |
|||
SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id); |
|||
mmap.put("sysMakeOrder", sysMakeOrder); |
|||
return prefix + "/edit"; |
|||
} |
|||
|
|||
/** |
|||
* 修改保存生产订单 |
|||
*/ |
|||
@RequiresPermissions("system:makeorder:edit") |
|||
@Log(title = "生产订单", businessType = BusinessType.UPDATE) |
|||
@PostMapping("/edit") |
|||
@ResponseBody |
|||
public AjaxResult editSave(SysMakeOrder sysMakeOrder) |
|||
{ |
|||
return toAjax(sysMakeOrderService.updateSysMakeOrder(sysMakeOrder)); |
|||
} |
|||
|
|||
/** |
|||
* 删除生产订单 |
|||
*/ |
|||
@RequiresPermissions("system:makeorder:remove") |
|||
@Log(title = "生产订单", businessType = BusinessType.DELETE) |
|||
@PostMapping( "/remove") |
|||
@ResponseBody |
|||
public AjaxResult remove(String ids) |
|||
{ |
|||
return toAjax(sysMakeOrderService.deleteSysMakeOrderByIds(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 作废生产订单 |
|||
*/ |
|||
@RequiresPermissions("system:makeorder:cancel") |
|||
@Log(title = "生产订单", businessType = BusinessType.CANCEL) |
|||
@GetMapping( "/cancel/{id}") |
|||
@ResponseBody |
|||
public AjaxResult cancel(@PathVariable("id") Long id){ |
|||
return toAjax(sysMakeOrderService.cancelSysMakeOrderById(id)); |
|||
} |
|||
|
|||
/** |
|||
* 恢复生产订单 |
|||
*/ |
|||
@RequiresPermissions("system:makeorder:restore") |
|||
@Log(title = "生产订单", businessType = BusinessType.RESTORE) |
|||
@GetMapping( "/restore/{id}") |
|||
@ResponseBody |
|||
public AjaxResult restore(@PathVariable("id")Long id) |
|||
{ |
|||
return toAjax(sysMakeOrderService.restoreSysMakeOrderById(id)); |
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,148 @@ |
|||
package com.ruoyi.system.controller; |
|||
|
|||
import com.ruoyi.common.annotation.Log; |
|||
import com.ruoyi.common.core.controller.BaseController; |
|||
import com.ruoyi.common.core.domain.AjaxResult; |
|||
import com.ruoyi.common.core.page.TableDataInfo; |
|||
import com.ruoyi.common.enums.BusinessType; |
|||
import com.ruoyi.common.utils.poi.ExcelUtil; |
|||
import com.ruoyi.system.domain.SysPicking; |
|||
import com.ruoyi.system.service.ISysPickingService; |
|||
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-12-15 |
|||
*/ |
|||
@Controller |
|||
@RequestMapping("/system/picking") |
|||
public class SysPickingController extends BaseController |
|||
{ |
|||
private String prefix = "system/picking"; |
|||
|
|||
@Autowired |
|||
private ISysPickingService sysPickingService; |
|||
|
|||
@RequiresPermissions("system:picking:view") |
|||
@GetMapping() |
|||
public String picking() |
|||
{ |
|||
return prefix + "/picking"; |
|||
} |
|||
|
|||
/** |
|||
* 查询开发修改单领料列表列表 |
|||
*/ |
|||
@RequiresPermissions("system:picking:list") |
|||
@PostMapping("/list") |
|||
@ResponseBody |
|||
public TableDataInfo list(SysPicking sysPicking) |
|||
{ |
|||
startPage(); |
|||
List<SysPicking> list = sysPickingService.selectSysPickingList(sysPicking); |
|||
return getDataTable(list); |
|||
} |
|||
|
|||
/** |
|||
* 导出开发修改单领料列表列表 |
|||
*/ |
|||
@RequiresPermissions("system:picking:export") |
|||
@Log(title = "开发修改单领料列表", businessType = BusinessType.EXPORT) |
|||
@PostMapping("/export") |
|||
@ResponseBody |
|||
public AjaxResult export(SysPicking sysPicking) |
|||
{ |
|||
List<SysPicking> list = sysPickingService.selectSysPickingList(sysPicking); |
|||
ExcelUtil<SysPicking> util = new ExcelUtil<SysPicking>(SysPicking.class); |
|||
return util.exportExcel(list, "开发修改单领料列表数据"); |
|||
} |
|||
|
|||
/** |
|||
* 新增开发修改单领料列表 |
|||
*/ |
|||
@GetMapping("/add") |
|||
public String add() |
|||
{ |
|||
return prefix + "/add"; |
|||
} |
|||
|
|||
/** |
|||
* 新增保存开发修改单领料列表 |
|||
*/ |
|||
@RequiresPermissions("system:picking:add") |
|||
@Log(title = "开发修改单领料列表", businessType = BusinessType.INSERT) |
|||
@PostMapping("/add") |
|||
@ResponseBody |
|||
public AjaxResult addSave(SysPicking sysPicking) |
|||
{ |
|||
return toAjax(sysPickingService.insertSysPicking(sysPicking)); |
|||
} |
|||
|
|||
/** |
|||
* 修改开发修改单领料列表 |
|||
*/ |
|||
@GetMapping("/edit/{pickId}") |
|||
public String edit(@PathVariable("pickId") Long pickId, ModelMap mmap) |
|||
{ |
|||
SysPicking sysPicking = sysPickingService.selectSysPickingById(pickId); |
|||
mmap.put("sysPicking", sysPicking); |
|||
return prefix + "/edit"; |
|||
} |
|||
|
|||
/** |
|||
* 修改保存开发修改单领料列表 |
|||
*/ |
|||
@RequiresPermissions("system:picking:edit") |
|||
@Log(title = "开发修改单领料列表", businessType = BusinessType.UPDATE) |
|||
@PostMapping("/edit") |
|||
@ResponseBody |
|||
public AjaxResult editSave(SysPicking sysPicking) |
|||
{ |
|||
return toAjax(sysPickingService.updateSysPicking(sysPicking)); |
|||
} |
|||
|
|||
/** |
|||
* 删除开发修改单领料列表 |
|||
*/ |
|||
@RequiresPermissions("system:picking:remove") |
|||
@Log(title = "开发修改单领料列表", businessType = BusinessType.DELETE) |
|||
@PostMapping( "/remove") |
|||
@ResponseBody |
|||
public AjaxResult remove(String ids) |
|||
{ |
|||
return toAjax(sysPickingService.deleteSysPickingByIds(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 作废开发修改单领料列表 |
|||
*/ |
|||
@RequiresPermissions("system:picking:cancel") |
|||
@Log(title = "开发修改单领料列表", businessType = BusinessType.CANCEL) |
|||
@GetMapping( "/cancel/{id}") |
|||
@ResponseBody |
|||
public AjaxResult cancel(@PathVariable("id") Long id){ |
|||
return toAjax(sysPickingService.cancelSysPickingById(id)); |
|||
} |
|||
|
|||
/** |
|||
* 恢复开发修改单领料列表 |
|||
*/ |
|||
@RequiresPermissions("system:picking:restore") |
|||
@Log(title = "开发修改单领料列表", businessType = BusinessType.RESTORE) |
|||
@GetMapping( "/restore/{id}") |
|||
@ResponseBody |
|||
public AjaxResult restore(@PathVariable("id")Long id) |
|||
{ |
|||
return toAjax(sysPickingService.restoreSysPickingById(id)); |
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,148 @@ |
|||
package com.ruoyi.system.controller; |
|||
|
|||
import com.ruoyi.common.annotation.Log; |
|||
import com.ruoyi.common.core.controller.BaseController; |
|||
import com.ruoyi.common.core.domain.AjaxResult; |
|||
import com.ruoyi.common.core.page.TableDataInfo; |
|||
import com.ruoyi.common.enums.BusinessType; |
|||
import com.ruoyi.common.utils.poi.ExcelUtil; |
|||
import com.ruoyi.system.domain.SysProductModel; |
|||
import com.ruoyi.system.service.ISysProductModelService; |
|||
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 zhang |
|||
* @date 2023-12-15 |
|||
*/ |
|||
@Controller |
|||
@RequestMapping("/system/model") |
|||
public class SysProductModelController extends BaseController |
|||
{ |
|||
private String prefix = "system/model"; |
|||
|
|||
@Autowired |
|||
private ISysProductModelService sysProductModelService; |
|||
|
|||
@RequiresPermissions("system:model:view") |
|||
@GetMapping() |
|||
public String model() |
|||
{ |
|||
return prefix + "/model"; |
|||
} |
|||
|
|||
/** |
|||
* 查询产品型号管理列表 |
|||
*/ |
|||
@RequiresPermissions("system:model:list") |
|||
@PostMapping("/list") |
|||
@ResponseBody |
|||
public TableDataInfo list(SysProductModel sysProductModel) |
|||
{ |
|||
startPage(); |
|||
List<SysProductModel> list = sysProductModelService.selectSysProductModelList(sysProductModel); |
|||
return getDataTable(list); |
|||
} |
|||
|
|||
/** |
|||
* 导出产品型号管理列表 |
|||
*/ |
|||
@RequiresPermissions("system:model:export") |
|||
@Log(title = "产品型号管理", businessType = BusinessType.EXPORT) |
|||
@PostMapping("/export") |
|||
@ResponseBody |
|||
public AjaxResult export(SysProductModel sysProductModel) |
|||
{ |
|||
List<SysProductModel> list = sysProductModelService.selectSysProductModelList(sysProductModel); |
|||
ExcelUtil<SysProductModel> util = new ExcelUtil<SysProductModel>(SysProductModel.class); |
|||
return util.exportExcel(list, "产品型号管理数据"); |
|||
} |
|||
|
|||
/** |
|||
* 新增产品型号管理 |
|||
*/ |
|||
@GetMapping("/add") |
|||
public String add() |
|||
{ |
|||
return prefix + "/add"; |
|||
} |
|||
|
|||
/** |
|||
* 新增保存产品型号管理 |
|||
*/ |
|||
@RequiresPermissions("system:model:add") |
|||
@Log(title = "产品型号管理", businessType = BusinessType.INSERT) |
|||
@PostMapping("/add") |
|||
@ResponseBody |
|||
public AjaxResult addSave(SysProductModel sysProductModel) |
|||
{ |
|||
return toAjax(sysProductModelService.insertSysProductModel(sysProductModel)); |
|||
} |
|||
|
|||
/** |
|||
* 修改产品型号管理 |
|||
*/ |
|||
@GetMapping("/edit/{Pid}") |
|||
public String edit(@PathVariable("Pid") Long Pid, ModelMap mmap) |
|||
{ |
|||
SysProductModel sysProductModel = sysProductModelService.selectSysProductModelById(Pid); |
|||
mmap.put("sysProductModel", sysProductModel); |
|||
return prefix + "/edit"; |
|||
} |
|||
|
|||
/** |
|||
* 修改保存产品型号管理 |
|||
*/ |
|||
@RequiresPermissions("system:model:edit") |
|||
@Log(title = "产品型号管理", businessType = BusinessType.UPDATE) |
|||
@PostMapping("/edit") |
|||
@ResponseBody |
|||
public AjaxResult editSave(SysProductModel sysProductModel) |
|||
{ |
|||
return toAjax(sysProductModelService.updateSysProductModel(sysProductModel)); |
|||
} |
|||
|
|||
/** |
|||
* 删除产品型号管理 |
|||
*/ |
|||
@RequiresPermissions("system:model:remove") |
|||
@Log(title = "产品型号管理", businessType = BusinessType.DELETE) |
|||
@PostMapping( "/remove") |
|||
@ResponseBody |
|||
public AjaxResult remove(String ids) |
|||
{ |
|||
return toAjax(sysProductModelService.deleteSysProductModelByIds(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 作废产品型号管理 |
|||
*/ |
|||
@RequiresPermissions("system:model:cancel") |
|||
@Log(title = "产品型号管理", businessType = BusinessType.CANCEL) |
|||
@GetMapping( "/cancel/{id}") |
|||
@ResponseBody |
|||
public AjaxResult cancel(@PathVariable("id") Long id){ |
|||
return toAjax(sysProductModelService.cancelSysProductModelById(id)); |
|||
} |
|||
|
|||
/** |
|||
* 恢复产品型号管理 |
|||
*/ |
|||
@RequiresPermissions("system:model:restore") |
|||
@Log(title = "产品型号管理", businessType = BusinessType.RESTORE) |
|||
@GetMapping( "/restore/{id}") |
|||
@ResponseBody |
|||
public AjaxResult restore(@PathVariable("id")Long id) |
|||
{ |
|||
return toAjax(sysProductModelService.restoreSysProductModelById(id)); |
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,279 @@ |
|||
package com.ruoyi.system.domain; |
|||
|
|||
import com.ruoyi.common.annotation.Excel; |
|||
import com.ruoyi.common.core.domain.BaseEntity; |
|||
import org.apache.commons.lang3.builder.ToStringBuilder; |
|||
import org.apache.commons.lang3.builder.ToStringStyle; |
|||
|
|||
/** |
|||
* 生产订单对象 sys_makeorder |
|||
* |
|||
* @author zhang |
|||
* @date 2023-12-18 |
|||
*/ |
|||
public class SysMakeOrder extends BaseEntity |
|||
{ |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** 生产订单id */ |
|||
private Long id; |
|||
|
|||
/** 生产状态 */ |
|||
@Excel(name = "生产状态") |
|||
private String makeStatus; |
|||
|
|||
/** 入库状态 */ |
|||
@Excel(name = "入库状态") |
|||
private String eceiptStatus; |
|||
|
|||
/** 品质状态 */ |
|||
@Excel(name = "品质状态") |
|||
private String qualityStatus; |
|||
|
|||
/** 使用状态 */ |
|||
@Excel(name = "使用状态") |
|||
private String useStatus; |
|||
|
|||
/** 生产订单号 */ |
|||
@Excel(name = "生产订单号") |
|||
private String makeNo; |
|||
|
|||
/** 关联销售订单号 */ |
|||
@Excel(name = "关联销售订单号") |
|||
private String saleNo; |
|||
|
|||
/** 业务员 */ |
|||
@Excel(name = "业务员") |
|||
private String Salesman; |
|||
|
|||
/** 客户ID */ |
|||
@Excel(name = "客户ID") |
|||
private String customerId; |
|||
|
|||
/** 客户名称 */ |
|||
@Excel(name = "客户名称") |
|||
private String customerName; |
|||
|
|||
/** 客户订单号 */ |
|||
@Excel(name = "客户订单号") |
|||
private String customerOderCode; |
|||
|
|||
/** 物料合计 */ |
|||
@Excel(name = "物料合计") |
|||
private String material; |
|||
|
|||
/** 数量合计 */ |
|||
@Excel(name = "数量合计") |
|||
private Long materialSum; |
|||
|
|||
/** 已完成数量 */ |
|||
@Excel(name = "已完成数量") |
|||
private Long finishNum; |
|||
|
|||
/** 已入库数量 */ |
|||
@Excel(name = "已入库数量") |
|||
private Long eceiptNum; |
|||
|
|||
/** 不含税生产成本(RMB) */ |
|||
@Excel(name = "不含税生产成本(RMB)") |
|||
private Long noRate; |
|||
|
|||
/** 含税生产成本(RMB) */ |
|||
@Excel(name = "含税生产成本(RMB)") |
|||
private Long rate; |
|||
|
|||
/** 使用状态 */ |
|||
private String delFlag; |
|||
|
|||
public void setId(Long id) |
|||
{ |
|||
this.id = id; |
|||
} |
|||
|
|||
public Long getId() |
|||
{ |
|||
return id; |
|||
} |
|||
public void setMakeStatus(String makeStatus) |
|||
{ |
|||
this.makeStatus = makeStatus; |
|||
} |
|||
|
|||
public String getMakeStatus() |
|||
{ |
|||
return makeStatus; |
|||
} |
|||
public void setEceiptStatus(String eceiptStatus) |
|||
{ |
|||
this.eceiptStatus = eceiptStatus; |
|||
} |
|||
|
|||
public String getEceiptStatus() |
|||
{ |
|||
return eceiptStatus; |
|||
} |
|||
public void setQualityStatus(String qualityStatus) |
|||
{ |
|||
this.qualityStatus = qualityStatus; |
|||
} |
|||
|
|||
public String getQualityStatus() |
|||
{ |
|||
return qualityStatus; |
|||
} |
|||
public void setUseStatus(String useStatus) |
|||
{ |
|||
this.useStatus = useStatus; |
|||
} |
|||
|
|||
public String getUseStatus() |
|||
{ |
|||
return useStatus; |
|||
} |
|||
public void setMakeNo(String makeNo) |
|||
{ |
|||
this.makeNo = makeNo; |
|||
} |
|||
|
|||
public String getMakeNo() |
|||
{ |
|||
return makeNo; |
|||
} |
|||
public void setSaleNo(String saleNo) |
|||
{ |
|||
this.saleNo = saleNo; |
|||
} |
|||
|
|||
public String getSaleNo() |
|||
{ |
|||
return saleNo; |
|||
} |
|||
public void setSalesman(String Salesman) |
|||
{ |
|||
this.Salesman = Salesman; |
|||
} |
|||
|
|||
public String getSalesman() |
|||
{ |
|||
return Salesman; |
|||
} |
|||
public void setCustomerId(String customerId) |
|||
{ |
|||
this.customerId = customerId; |
|||
} |
|||
|
|||
public String getCustomerId() |
|||
{ |
|||
return customerId; |
|||
} |
|||
public void setCustomerName(String customerName) |
|||
{ |
|||
this.customerName = customerName; |
|||
} |
|||
|
|||
public String getCustomerName() |
|||
{ |
|||
return customerName; |
|||
} |
|||
public void setCustomerOderCode(String customerOderCode) |
|||
{ |
|||
this.customerOderCode = customerOderCode; |
|||
} |
|||
|
|||
public String getCustomerOderCode() |
|||
{ |
|||
return customerOderCode; |
|||
} |
|||
public void setMaterial(String material) |
|||
{ |
|||
this.material = material; |
|||
} |
|||
|
|||
public String getMaterial() |
|||
{ |
|||
return material; |
|||
} |
|||
public void setMaterialSum(Long materialSum) |
|||
{ |
|||
this.materialSum = materialSum; |
|||
} |
|||
|
|||
public Long getMaterialSum() |
|||
{ |
|||
return materialSum; |
|||
} |
|||
public void setFinishNum(Long finishNum) |
|||
{ |
|||
this.finishNum = finishNum; |
|||
} |
|||
|
|||
public Long getFinishNum() |
|||
{ |
|||
return finishNum; |
|||
} |
|||
public void setEceiptNum(Long eceiptNum) |
|||
{ |
|||
this.eceiptNum = eceiptNum; |
|||
} |
|||
|
|||
public Long getEceiptNum() |
|||
{ |
|||
return eceiptNum; |
|||
} |
|||
public void setNoRate(Long noRate) |
|||
{ |
|||
this.noRate = noRate; |
|||
} |
|||
|
|||
public Long getNoRate() |
|||
{ |
|||
return noRate; |
|||
} |
|||
public void setRate(Long rate) |
|||
{ |
|||
this.rate = rate; |
|||
} |
|||
|
|||
public Long getRate() |
|||
{ |
|||
return rate; |
|||
} |
|||
public void setDelFlag(String delFlag) |
|||
{ |
|||
this.delFlag = delFlag; |
|||
} |
|||
|
|||
public String getDelFlag() |
|||
{ |
|||
return delFlag; |
|||
} |
|||
|
|||
@Override |
|||
public String toString() { |
|||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
|||
.append("id", getId()) |
|||
.append("makeStatus", getMakeStatus()) |
|||
.append("eceiptStatus", getEceiptStatus()) |
|||
.append("qualityStatus", getQualityStatus()) |
|||
.append("useStatus", getUseStatus()) |
|||
.append("makeNo", getMakeNo()) |
|||
.append("saleNo", getSaleNo()) |
|||
.append("Salesman", getSalesman()) |
|||
.append("customerId", getCustomerId()) |
|||
.append("customerName", getCustomerName()) |
|||
.append("customerOderCode", getCustomerOderCode()) |
|||
.append("material", getMaterial()) |
|||
.append("materialSum", getMaterialSum()) |
|||
.append("finishNum", getFinishNum()) |
|||
.append("eceiptNum", getEceiptNum()) |
|||
.append("noRate", getNoRate()) |
|||
.append("rate", getRate()) |
|||
.append("createBy", getCreateBy()) |
|||
.append("createTime", getCreateTime()) |
|||
.append("updateBy", getUpdateBy()) |
|||
.append("updateTime", getUpdateTime()) |
|||
.append("remark", getRemark()) |
|||
.append("delFlag", getDelFlag()) |
|||
.toString(); |
|||
} |
|||
} |
|||
@ -0,0 +1,153 @@ |
|||
package com.ruoyi.system.domain; |
|||
|
|||
import com.ruoyi.common.annotation.Excel; |
|||
import com.ruoyi.common.core.domain.BaseEntity; |
|||
import org.apache.commons.lang3.builder.ToStringBuilder; |
|||
import org.apache.commons.lang3.builder.ToStringStyle; |
|||
|
|||
/** |
|||
* 开发修改单领料列表对象 sys_picking |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-12-15 |
|||
*/ |
|||
public class SysPicking extends BaseEntity |
|||
{ |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** 领料单id */ |
|||
private Long pickId; |
|||
|
|||
/** 领料单号 */ |
|||
@Excel(name = "领料单号") |
|||
private String pickNo; |
|||
|
|||
/** 领料状态 */ |
|||
@Excel(name = "领料状态") |
|||
private String pickStaus; |
|||
|
|||
/** 关联销售单号 */ |
|||
@Excel(name = "关联销售单号") |
|||
private String saleNo; |
|||
|
|||
/** 类型 */ |
|||
@Excel(name = "类型") |
|||
private String types; |
|||
|
|||
/** 物料合计 */ |
|||
@Excel(name = "物料合计") |
|||
private String materialM; |
|||
|
|||
/** 合计量 */ |
|||
@Excel(name = "合计量") |
|||
private String materialSum; |
|||
|
|||
/** 操作 */ |
|||
@Excel(name = "操作") |
|||
private String opers; |
|||
|
|||
/** */ |
|||
private String pickBy; |
|||
|
|||
public void setPickId(Long pickId) |
|||
{ |
|||
this.pickId = pickId; |
|||
} |
|||
|
|||
public Long getPickId() |
|||
{ |
|||
return pickId; |
|||
} |
|||
public void setPickNo(String pickNo) |
|||
{ |
|||
this.pickNo = pickNo; |
|||
} |
|||
|
|||
public String getPickNo() |
|||
{ |
|||
return pickNo; |
|||
} |
|||
public void setPickStaus(String pickStaus) |
|||
{ |
|||
this.pickStaus = pickStaus; |
|||
} |
|||
|
|||
public String getPickStaus() |
|||
{ |
|||
return pickStaus; |
|||
} |
|||
public void setSaleNo(String saleNo) |
|||
{ |
|||
this.saleNo = saleNo; |
|||
} |
|||
|
|||
public String getSaleNo() |
|||
{ |
|||
return saleNo; |
|||
} |
|||
public void setTypes(String types) |
|||
{ |
|||
this.types = types; |
|||
} |
|||
|
|||
public String getTypes() |
|||
{ |
|||
return types; |
|||
} |
|||
public void setMaterialM(String materialM) |
|||
{ |
|||
this.materialM = materialM; |
|||
} |
|||
|
|||
public String getMaterialM() |
|||
{ |
|||
return materialM; |
|||
} |
|||
public void setMaterialSum(String materialSum) |
|||
{ |
|||
this.materialSum = materialSum; |
|||
} |
|||
|
|||
public String getMaterialSum() |
|||
{ |
|||
return materialSum; |
|||
} |
|||
public void setOpers(String opers) |
|||
{ |
|||
this.opers = opers; |
|||
} |
|||
|
|||
public String getOpers() |
|||
{ |
|||
return opers; |
|||
} |
|||
public void setPickBy(String pickBy) |
|||
{ |
|||
this.pickBy = pickBy; |
|||
} |
|||
|
|||
public String getPickBy() |
|||
{ |
|||
return pickBy; |
|||
} |
|||
|
|||
@Override |
|||
public String toString() { |
|||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
|||
.append("pickId", getPickId()) |
|||
.append("pickNo", getPickNo()) |
|||
.append("pickStaus", getPickStaus()) |
|||
.append("createBy", getCreateBy()) |
|||
.append("saleNo", getSaleNo()) |
|||
.append("types", getTypes()) |
|||
.append("materialM", getMaterialM()) |
|||
.append("materialSum", getMaterialSum()) |
|||
.append("createTime", getCreateTime()) |
|||
.append("updateBy", getUpdateBy()) |
|||
.append("updateTime", getUpdateTime()) |
|||
.append("opers", getOpers()) |
|||
.append("remark", getRemark()) |
|||
.append("pickBy", getPickBy()) |
|||
.toString(); |
|||
} |
|||
} |
|||
@ -0,0 +1,139 @@ |
|||
package com.ruoyi.system.domain; |
|||
|
|||
import com.ruoyi.common.annotation.Excel; |
|||
import com.ruoyi.common.core.domain.BaseEntity; |
|||
import org.apache.commons.lang3.builder.ToStringBuilder; |
|||
import org.apache.commons.lang3.builder.ToStringStyle; |
|||
|
|||
/** |
|||
* 产品型号管理对象 sys_product_model |
|||
* |
|||
* @author zhang |
|||
* @date 2023-12-15 |
|||
*/ |
|||
public class SysProductModel extends BaseEntity |
|||
{ |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** 产品型号管理表id */ |
|||
private Long Pid; |
|||
|
|||
/** 产品型号ID */ |
|||
@Excel(name = "产品型号ID") |
|||
private String Pcode; |
|||
|
|||
/** 设备型号 */ |
|||
@Excel(name = "设备型号") |
|||
private String equipModel; |
|||
|
|||
/** 设备名称 */ |
|||
@Excel(name = "设备名称") |
|||
private String equipName; |
|||
|
|||
/** 规格说明 */ |
|||
@Excel(name = "规格说明") |
|||
private String specification; |
|||
|
|||
/** 差异说明 */ |
|||
@Excel(name = "差异说明") |
|||
private String differences; |
|||
|
|||
/** 更新人 */ |
|||
@Excel(name = "更新人") |
|||
private String udpateBy; |
|||
|
|||
/** 图片地址 */ |
|||
@Excel(name = "图片地址") |
|||
private String photoUrl; |
|||
|
|||
public void setPid(Long Pid) |
|||
{ |
|||
this.Pid = Pid; |
|||
} |
|||
|
|||
public Long getPid() |
|||
{ |
|||
return Pid; |
|||
} |
|||
public void setPcode(String Pcode) |
|||
{ |
|||
this.Pcode = Pcode; |
|||
} |
|||
|
|||
public String getPcode() |
|||
{ |
|||
return Pcode; |
|||
} |
|||
public void setEquipModel(String equipModel) |
|||
{ |
|||
this.equipModel = equipModel; |
|||
} |
|||
|
|||
public String getEquipModel() |
|||
{ |
|||
return equipModel; |
|||
} |
|||
public void setEquipName(String equipName) |
|||
{ |
|||
this.equipName = equipName; |
|||
} |
|||
|
|||
public String getEquipName() |
|||
{ |
|||
return equipName; |
|||
} |
|||
public void setSpecification(String specification) |
|||
{ |
|||
this.specification = specification; |
|||
} |
|||
|
|||
public String getSpecification() |
|||
{ |
|||
return specification; |
|||
} |
|||
public void setDifferences(String differences) |
|||
{ |
|||
this.differences = differences; |
|||
} |
|||
|
|||
public String getDifferences() |
|||
{ |
|||
return differences; |
|||
} |
|||
public void setUdpateBy(String udpateBy) |
|||
{ |
|||
this.udpateBy = udpateBy; |
|||
} |
|||
|
|||
public String getUdpateBy() |
|||
{ |
|||
return udpateBy; |
|||
} |
|||
public void setPhotoUrl(String photoUrl) |
|||
{ |
|||
this.photoUrl = photoUrl; |
|||
} |
|||
|
|||
public String getPhotoUrl() |
|||
{ |
|||
return photoUrl; |
|||
} |
|||
|
|||
@Override |
|||
public String toString() { |
|||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
|||
.append("Pid", getPid()) |
|||
.append("Pcode", getPcode()) |
|||
.append("createBy", getCreateBy()) |
|||
.append("equipModel", getEquipModel()) |
|||
.append("equipName", getEquipName()) |
|||
.append("specification", getSpecification()) |
|||
.append("differences", getDifferences()) |
|||
.append("remark", getRemark()) |
|||
.append("createTime", getCreateTime()) |
|||
.append("udpateBy", getUdpateBy()) |
|||
.append("updateTime", getUpdateTime()) |
|||
.append("photoUrl", getPhotoUrl()) |
|||
.toString(); |
|||
} |
|||
} |
|||
@ -0,0 +1,78 @@ |
|||
package com.ruoyi.system.mapper; |
|||
|
|||
import com.ruoyi.system.domain.SysMakeOrder; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 生产订单Mapper接口 |
|||
* |
|||
* @author zhang |
|||
* @date 2023-12-18 |
|||
*/ |
|||
public interface SysMakeOrderMapper |
|||
{ |
|||
/** |
|||
* 查询生产订单 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 生产订单 |
|||
*/ |
|||
public SysMakeOrder selectSysMakeOrderById(Long id); |
|||
|
|||
/** |
|||
* 查询生产订单列表 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 生产订单集合 |
|||
*/ |
|||
public List<SysMakeOrder> selectSysMakeOrderList(SysMakeOrder sysMakeOrder); |
|||
|
|||
/** |
|||
* 新增生产订单 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 结果 |
|||
*/ |
|||
public int insertSysMakeOrder(SysMakeOrder sysMakeOrder); |
|||
|
|||
/** |
|||
* 修改生产订单 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 结果 |
|||
*/ |
|||
public int updateSysMakeOrder(SysMakeOrder sysMakeOrder); |
|||
|
|||
/** |
|||
* 删除生产订单 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysMakeOrderById(Long id); |
|||
|
|||
/** |
|||
* 批量删除生产订单 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysMakeOrderByIds(String[] ids); |
|||
|
|||
/** |
|||
* 作废生产订单 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 结果 |
|||
*/ |
|||
public int cancelSysMakeOrderById(Long id); |
|||
|
|||
/** |
|||
* 恢复生产订单 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 结果 |
|||
*/ |
|||
public int restoreSysMakeOrderById(Long id); |
|||
} |
|||
@ -0,0 +1,78 @@ |
|||
package com.ruoyi.system.mapper; |
|||
|
|||
import com.ruoyi.system.domain.SysPicking; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 开发修改单领料列表Mapper接口 |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-12-15 |
|||
*/ |
|||
public interface SysPickingMapper |
|||
{ |
|||
/** |
|||
* 查询开发修改单领料列表 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 开发修改单领料列表 |
|||
*/ |
|||
public SysPicking selectSysPickingById(Long pickId); |
|||
|
|||
/** |
|||
* 查询开发修改单领料列表列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 开发修改单领料列表集合 |
|||
*/ |
|||
public List<SysPicking> selectSysPickingList(SysPicking sysPicking); |
|||
|
|||
/** |
|||
* 新增开发修改单领料列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 结果 |
|||
*/ |
|||
public int insertSysPicking(SysPicking sysPicking); |
|||
|
|||
/** |
|||
* 修改开发修改单领料列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 结果 |
|||
*/ |
|||
public int updateSysPicking(SysPicking sysPicking); |
|||
|
|||
/** |
|||
* 删除开发修改单领料列表 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysPickingById(Long pickId); |
|||
|
|||
/** |
|||
* 批量删除开发修改单领料列表 |
|||
* |
|||
* @param pickIds 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysPickingByIds(String[] pickIds); |
|||
|
|||
/** |
|||
* 作废开发修改单领料列表 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 结果 |
|||
*/ |
|||
public int cancelSysPickingById(Long pickId); |
|||
|
|||
/** |
|||
* 恢复开发修改单领料列表 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 结果 |
|||
*/ |
|||
public int restoreSysPickingById(Long pickId); |
|||
} |
|||
@ -0,0 +1,78 @@ |
|||
package com.ruoyi.system.mapper; |
|||
|
|||
import com.ruoyi.system.domain.SysProductModel; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 产品型号管理Mapper接口 |
|||
* |
|||
* @author zhang |
|||
* @date 2023-12-15 |
|||
*/ |
|||
public interface SysProductModelMapper |
|||
{ |
|||
/** |
|||
* 查询产品型号管理 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 产品型号管理 |
|||
*/ |
|||
public SysProductModel selectSysProductModelById(Long Pid); |
|||
|
|||
/** |
|||
* 查询产品型号管理列表 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 产品型号管理集合 |
|||
*/ |
|||
public List<SysProductModel> selectSysProductModelList(SysProductModel sysProductModel); |
|||
|
|||
/** |
|||
* 新增产品型号管理 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 结果 |
|||
*/ |
|||
public int insertSysProductModel(SysProductModel sysProductModel); |
|||
|
|||
/** |
|||
* 修改产品型号管理 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 结果 |
|||
*/ |
|||
public int updateSysProductModel(SysProductModel sysProductModel); |
|||
|
|||
/** |
|||
* 删除产品型号管理 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysProductModelById(Long Pid); |
|||
|
|||
/** |
|||
* 批量删除产品型号管理 |
|||
* |
|||
* @param Pids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysProductModelByIds(String[] Pids); |
|||
|
|||
/** |
|||
* 作废产品型号管理 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 结果 |
|||
*/ |
|||
public int cancelSysProductModelById(Long Pid); |
|||
|
|||
/** |
|||
* 恢复产品型号管理 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 结果 |
|||
*/ |
|||
public int restoreSysProductModelById(Long Pid); |
|||
} |
|||
@ -0,0 +1,76 @@ |
|||
package com.ruoyi.system.service; |
|||
|
|||
import com.ruoyi.system.domain.SysMakeOrder; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 生产订单Service接口 |
|||
* |
|||
* @author zhang |
|||
* @date 2023-12-18 |
|||
*/ |
|||
public interface ISysMakeOrderService |
|||
{ |
|||
/** |
|||
* 查询生产订单 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 生产订单 |
|||
*/ |
|||
public SysMakeOrder selectSysMakeOrderById(Long id); |
|||
|
|||
/** |
|||
* 查询生产订单列表 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 生产订单集合 |
|||
*/ |
|||
public List<SysMakeOrder> selectSysMakeOrderList(SysMakeOrder sysMakeOrder); |
|||
|
|||
/** |
|||
* 新增生产订单 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 结果 |
|||
*/ |
|||
public int insertSysMakeOrder(SysMakeOrder sysMakeOrder); |
|||
|
|||
/** |
|||
* 修改生产订单 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 结果 |
|||
*/ |
|||
public int updateSysMakeOrder(SysMakeOrder sysMakeOrder); |
|||
|
|||
/** |
|||
* 批量删除生产订单 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysMakeOrderByIds(String ids); |
|||
|
|||
/** |
|||
* 删除生产订单信息 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysMakeOrderById(Long id); |
|||
|
|||
/** |
|||
* 作废生产订单 |
|||
* @param id 生产订单ID |
|||
* @return |
|||
*/ |
|||
int cancelSysMakeOrderById(Long id); |
|||
|
|||
/** |
|||
* 恢复生产订单 |
|||
* @param id 生产订单ID |
|||
* @return |
|||
*/ |
|||
int restoreSysMakeOrderById(Long id); |
|||
} |
|||
@ -0,0 +1,76 @@ |
|||
package com.ruoyi.system.service; |
|||
|
|||
import com.ruoyi.system.domain.SysPicking; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 开发修改单领料列表Service接口 |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-12-15 |
|||
*/ |
|||
public interface ISysPickingService |
|||
{ |
|||
/** |
|||
* 查询开发修改单领料列表 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 开发修改单领料列表 |
|||
*/ |
|||
public SysPicking selectSysPickingById(Long pickId); |
|||
|
|||
/** |
|||
* 查询开发修改单领料列表列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 开发修改单领料列表集合 |
|||
*/ |
|||
public List<SysPicking> selectSysPickingList(SysPicking sysPicking); |
|||
|
|||
/** |
|||
* 新增开发修改单领料列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 结果 |
|||
*/ |
|||
public int insertSysPicking(SysPicking sysPicking); |
|||
|
|||
/** |
|||
* 修改开发修改单领料列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 结果 |
|||
*/ |
|||
public int updateSysPicking(SysPicking sysPicking); |
|||
|
|||
/** |
|||
* 批量删除开发修改单领料列表 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysPickingByIds(String ids); |
|||
|
|||
/** |
|||
* 删除开发修改单领料列表信息 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysPickingById(Long pickId); |
|||
|
|||
/** |
|||
* 作废开发修改单领料列表 |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return |
|||
*/ |
|||
int cancelSysPickingById(Long pickId); |
|||
|
|||
/** |
|||
* 恢复开发修改单领料列表 |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return |
|||
*/ |
|||
int restoreSysPickingById(Long pickId); |
|||
} |
|||
@ -0,0 +1,76 @@ |
|||
package com.ruoyi.system.service; |
|||
|
|||
import com.ruoyi.system.domain.SysProductModel; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 产品型号管理Service接口 |
|||
* |
|||
* @author zhang |
|||
* @date 2023-12-15 |
|||
*/ |
|||
public interface ISysProductModelService |
|||
{ |
|||
/** |
|||
* 查询产品型号管理 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 产品型号管理 |
|||
*/ |
|||
public SysProductModel selectSysProductModelById(Long Pid); |
|||
|
|||
/** |
|||
* 查询产品型号管理列表 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 产品型号管理集合 |
|||
*/ |
|||
public List<SysProductModel> selectSysProductModelList(SysProductModel sysProductModel); |
|||
|
|||
/** |
|||
* 新增产品型号管理 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 结果 |
|||
*/ |
|||
public int insertSysProductModel(SysProductModel sysProductModel); |
|||
|
|||
/** |
|||
* 修改产品型号管理 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 结果 |
|||
*/ |
|||
public int updateSysProductModel(SysProductModel sysProductModel); |
|||
|
|||
/** |
|||
* 批量删除产品型号管理 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysProductModelByIds(String ids); |
|||
|
|||
/** |
|||
* 删除产品型号管理信息 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteSysProductModelById(Long Pid); |
|||
|
|||
/** |
|||
* 作废产品型号管理 |
|||
* @param Pid 产品型号管理ID |
|||
* @return |
|||
*/ |
|||
int cancelSysProductModelById(Long Pid); |
|||
|
|||
/** |
|||
* 恢复产品型号管理 |
|||
* @param Pid 产品型号管理ID |
|||
* @return |
|||
*/ |
|||
int restoreSysProductModelById(Long Pid); |
|||
} |
|||
@ -0,0 +1,127 @@ |
|||
package com.ruoyi.system.service.impl; |
|||
|
|||
import com.ruoyi.common.core.text.Convert; |
|||
import com.ruoyi.common.utils.DateUtils; |
|||
import com.ruoyi.common.utils.ShiroUtils; |
|||
import com.ruoyi.system.domain.SysMakeOrder; |
|||
import com.ruoyi.system.mapper.SysMakeOrderMapper; |
|||
import com.ruoyi.system.service.ISysMakeOrderService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 生产订单Service业务层处理 |
|||
* |
|||
* @author zhang |
|||
* @date 2023-12-18 |
|||
*/ |
|||
@Service |
|||
public class SysMakeOrderServiceImpl implements ISysMakeOrderService |
|||
{ |
|||
@Autowired |
|||
private SysMakeOrderMapper sysMakeOrderMapper; |
|||
|
|||
/** |
|||
* 查询生产订单 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 生产订单 |
|||
*/ |
|||
@Override |
|||
public SysMakeOrder selectSysMakeOrderById(Long id) |
|||
{ |
|||
return sysMakeOrderMapper.selectSysMakeOrderById(id); |
|||
} |
|||
|
|||
/** |
|||
* 查询生产订单列表 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 生产订单 |
|||
*/ |
|||
@Override |
|||
public List<SysMakeOrder> selectSysMakeOrderList(SysMakeOrder sysMakeOrder) |
|||
{ |
|||
return sysMakeOrderMapper.selectSysMakeOrderList(sysMakeOrder); |
|||
} |
|||
|
|||
/** |
|||
* 新增生产订单 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int insertSysMakeOrder(SysMakeOrder sysMakeOrder) |
|||
{ |
|||
String loginName = ShiroUtils.getLoginName(); |
|||
sysMakeOrder.setCreateBy(loginName); |
|||
sysMakeOrder.setCreateTime(DateUtils.getNowDate()); |
|||
return sysMakeOrderMapper.insertSysMakeOrder(sysMakeOrder); |
|||
} |
|||
|
|||
/** |
|||
* 修改生产订单 |
|||
* |
|||
* @param sysMakeOrder 生产订单 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int updateSysMakeOrder(SysMakeOrder sysMakeOrder) |
|||
{ |
|||
String loginName = ShiroUtils.getLoginName(); |
|||
sysMakeOrder.setUpdateBy(loginName); |
|||
sysMakeOrder.setUpdateTime(DateUtils.getNowDate()); |
|||
return sysMakeOrderMapper.updateSysMakeOrder(sysMakeOrder); |
|||
} |
|||
|
|||
/** |
|||
* 删除生产订单对象 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int deleteSysMakeOrderByIds(String ids) |
|||
{ |
|||
return sysMakeOrderMapper.deleteSysMakeOrderByIds(Convert.toStrArray(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 删除生产订单信息 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int deleteSysMakeOrderById(Long id) |
|||
{ |
|||
return sysMakeOrderMapper.deleteSysMakeOrderById(id); |
|||
} |
|||
|
|||
/** |
|||
* 作废生产订单 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int cancelSysMakeOrderById(Long id) |
|||
{ |
|||
return sysMakeOrderMapper.cancelSysMakeOrderById(id); |
|||
} |
|||
|
|||
/** |
|||
* 恢复生产订单信息 |
|||
* |
|||
* @param id 生产订单ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int restoreSysMakeOrderById(Long id) |
|||
{ |
|||
return sysMakeOrderMapper.restoreSysMakeOrderById(id); |
|||
} |
|||
} |
|||
@ -0,0 +1,127 @@ |
|||
package com.ruoyi.system.service.impl; |
|||
|
|||
import com.ruoyi.common.core.text.Convert; |
|||
import com.ruoyi.common.utils.DateUtils; |
|||
import com.ruoyi.common.utils.ShiroUtils; |
|||
import com.ruoyi.system.domain.SysPicking; |
|||
import com.ruoyi.system.mapper.SysPickingMapper; |
|||
import com.ruoyi.system.service.ISysPickingService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 开发修改单领料列表Service业务层处理 |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-12-15 |
|||
*/ |
|||
@Service |
|||
public class SysPickingServiceImpl implements ISysPickingService |
|||
{ |
|||
@Autowired |
|||
private SysPickingMapper sysPickingMapper; |
|||
|
|||
/** |
|||
* 查询开发修改单领料列表 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 开发修改单领料列表 |
|||
*/ |
|||
@Override |
|||
public SysPicking selectSysPickingById(Long pickId) |
|||
{ |
|||
return sysPickingMapper.selectSysPickingById(pickId); |
|||
} |
|||
|
|||
/** |
|||
* 查询开发修改单领料列表列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 开发修改单领料列表 |
|||
*/ |
|||
@Override |
|||
public List<SysPicking> selectSysPickingList(SysPicking sysPicking) |
|||
{ |
|||
return sysPickingMapper.selectSysPickingList(sysPicking); |
|||
} |
|||
|
|||
/** |
|||
* 新增开发修改单领料列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int insertSysPicking(SysPicking sysPicking) |
|||
{ |
|||
String loginName = ShiroUtils.getLoginName(); |
|||
sysPicking.setCreateBy(loginName); |
|||
sysPicking.setCreateTime(DateUtils.getNowDate()); |
|||
return sysPickingMapper.insertSysPicking(sysPicking); |
|||
} |
|||
|
|||
/** |
|||
* 修改开发修改单领料列表 |
|||
* |
|||
* @param sysPicking 开发修改单领料列表 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int updateSysPicking(SysPicking sysPicking) |
|||
{ |
|||
String loginName = ShiroUtils.getLoginName(); |
|||
sysPicking.setUpdateBy(loginName); |
|||
sysPicking.setUpdateTime(DateUtils.getNowDate()); |
|||
return sysPickingMapper.updateSysPicking(sysPicking); |
|||
} |
|||
|
|||
/** |
|||
* 删除开发修改单领料列表对象 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int deleteSysPickingByIds(String ids) |
|||
{ |
|||
return sysPickingMapper.deleteSysPickingByIds(Convert.toStrArray(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 删除开发修改单领料列表信息 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int deleteSysPickingById(Long pickId) |
|||
{ |
|||
return sysPickingMapper.deleteSysPickingById(pickId); |
|||
} |
|||
|
|||
/** |
|||
* 作废开发修改单领料列表 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int cancelSysPickingById(Long pickId) |
|||
{ |
|||
return sysPickingMapper.cancelSysPickingById(pickId); |
|||
} |
|||
|
|||
/** |
|||
* 恢复开发修改单领料列表信息 |
|||
* |
|||
* @param pickId 开发修改单领料列表ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int restoreSysPickingById(Long pickId) |
|||
{ |
|||
return sysPickingMapper.restoreSysPickingById(pickId); |
|||
} |
|||
} |
|||
@ -0,0 +1,125 @@ |
|||
package com.ruoyi.system.service.impl; |
|||
|
|||
import com.ruoyi.common.core.text.Convert; |
|||
import com.ruoyi.common.utils.DateUtils; |
|||
import com.ruoyi.common.utils.ShiroUtils; |
|||
import com.ruoyi.system.domain.SysProductModel; |
|||
import com.ruoyi.system.mapper.SysProductModelMapper; |
|||
import com.ruoyi.system.service.ISysProductModelService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 产品型号管理Service业务层处理 |
|||
* |
|||
* @author zhang |
|||
* @date 2023-12-15 |
|||
*/ |
|||
@Service |
|||
public class SysProductModelServiceImpl implements ISysProductModelService |
|||
{ |
|||
@Autowired |
|||
private SysProductModelMapper sysProductModelMapper; |
|||
|
|||
/** |
|||
* 查询产品型号管理 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 产品型号管理 |
|||
*/ |
|||
@Override |
|||
public SysProductModel selectSysProductModelById(Long Pid) |
|||
{ |
|||
return sysProductModelMapper.selectSysProductModelById(Pid); |
|||
} |
|||
|
|||
/** |
|||
* 查询产品型号管理列表 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 产品型号管理 |
|||
*/ |
|||
@Override |
|||
public List<SysProductModel> selectSysProductModelList(SysProductModel sysProductModel) |
|||
{ |
|||
return sysProductModelMapper.selectSysProductModelList(sysProductModel); |
|||
} |
|||
|
|||
/** |
|||
* 新增产品型号管理 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int insertSysProductModel(SysProductModel sysProductModel) |
|||
{ |
|||
String loginName = ShiroUtils.getLoginName(); |
|||
sysProductModel.setCreateBy(loginName); |
|||
sysProductModel.setCreateTime(DateUtils.getNowDate()); |
|||
return sysProductModelMapper.insertSysProductModel(sysProductModel); |
|||
} |
|||
|
|||
/** |
|||
* 修改产品型号管理 |
|||
* |
|||
* @param sysProductModel 产品型号管理 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int updateSysProductModel(SysProductModel sysProductModel) |
|||
{ |
|||
sysProductModel.setUpdateTime(DateUtils.getNowDate()); |
|||
return sysProductModelMapper.updateSysProductModel(sysProductModel); |
|||
} |
|||
|
|||
/** |
|||
* 删除产品型号管理对象 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int deleteSysProductModelByIds(String ids) |
|||
{ |
|||
return sysProductModelMapper.deleteSysProductModelByIds(Convert.toStrArray(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 删除产品型号管理信息 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int deleteSysProductModelById(Long Pid) |
|||
{ |
|||
return sysProductModelMapper.deleteSysProductModelById(Pid); |
|||
} |
|||
|
|||
/** |
|||
* 作废产品型号管理 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int cancelSysProductModelById(Long Pid) |
|||
{ |
|||
return sysProductModelMapper.cancelSysProductModelById(Pid); |
|||
} |
|||
|
|||
/** |
|||
* 恢复产品型号管理信息 |
|||
* |
|||
* @param Pid 产品型号管理ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int restoreSysProductModelById(Long Pid) |
|||
{ |
|||
return sysProductModelMapper.restoreSysProductModelById(Pid); |
|||
} |
|||
} |
|||
@ -0,0 +1,159 @@ |
|||
<?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.system.mapper.SysMakeOrderMapper"> |
|||
|
|||
<resultMap type="SysMakeOrder" id="SysMakeOrderResult"> |
|||
<result property="id" column="id" /> |
|||
<result property="makeStatus" column="make_status" /> |
|||
<result property="eceiptStatus" column="eceipt_status" /> |
|||
<result property="qualityStatus" column="quality_status" /> |
|||
<result property="useStatus" column="use_status" /> |
|||
<result property="makeNo" column="makeNo" /> |
|||
<result property="saleNo" column="saleNo" /> |
|||
<result property="Salesman" column="Salesman" /> |
|||
<result property="customerId" column="customerId" /> |
|||
<result property="customerName" column="customerName" /> |
|||
<result property="customerOderCode" column="customerOderCode" /> |
|||
<result property="material" column="material" /> |
|||
<result property="materialSum" column="materialSum" /> |
|||
<result property="finishNum" column="finishNum" /> |
|||
<result property="eceiptNum" column="eceiptNum" /> |
|||
<result property="noRate" column="noRate" /> |
|||
<result property="rate" column="rate" /> |
|||
<result property="createBy" column="create_by" /> |
|||
<result property="createTime" column="create_time" /> |
|||
<result property="updateBy" column="update_by" /> |
|||
<result property="updateTime" column="update_time" /> |
|||
<result property="remark" column="remark" /> |
|||
<result property="delFlag" column="del_flag" /> |
|||
</resultMap> |
|||
|
|||
<sql id="selectSysMakeOrderVo"> |
|||
select id, make_status, eceipt_status, quality_status, use_status, makeNo, saleNo, Salesman, customerId, customerName, customerOderCode, material, materialSum, finishNum, eceiptNum, noRate, rate, create_by, create_time, update_by, update_time, remark, del_flag from sys_makeorder |
|||
</sql> |
|||
|
|||
<select id="selectSysMakeOrderList" parameterType="SysMakeOrder" resultMap="SysMakeOrderResult"> |
|||
<include refid="selectSysMakeOrderVo"/> |
|||
<where> |
|||
<if test="makeStatus != null and makeStatus != ''"> and make_status = #{makeStatus}</if> |
|||
<if test="eceiptStatus != null and eceiptStatus != ''"> and eceipt_status = #{eceiptStatus}</if> |
|||
<if test="qualityStatus != null and qualityStatus != ''"> and quality_status = #{qualityStatus}</if> |
|||
<if test="useStatus != null and useStatus != ''"> and use_status = #{useStatus}</if> |
|||
<if test="makeNo != null and makeNo != ''"> and makeNo = #{makeNo}</if> |
|||
<if test="saleNo != null and saleNo != ''"> and saleNo = #{saleNo}</if> |
|||
<if test="Salesman != null and Salesman != ''"> and Salesman = #{Salesman}</if> |
|||
<if test="customerId != null and customerId != ''"> and customerId = #{customerId}</if> |
|||
<if test="customerName != null and customerName != ''"> and customerName like concat('%', #{customerName}, '%')</if> |
|||
<if test="customerOderCode != null and customerOderCode != ''"> and customerOderCode = #{customerOderCode}</if> |
|||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if> |
|||
</where> |
|||
</select> |
|||
|
|||
<select id="selectSysMakeOrderById" parameterType="Long" resultMap="SysMakeOrderResult"> |
|||
<include refid="selectSysMakeOrderVo"/> |
|||
where id = #{id} |
|||
</select> |
|||
|
|||
<insert id="insertSysMakeOrder" parameterType="SysMakeOrder" useGeneratedKeys="true" keyProperty="id"> |
|||
insert into sys_makeorder |
|||
<trim prefix="(" suffix=")" suffixOverrides=","> |
|||
<if test="makeStatus != null">make_status,</if> |
|||
<if test="eceiptStatus != null">eceipt_status,</if> |
|||
<if test="qualityStatus != null">quality_status,</if> |
|||
<if test="useStatus != null">use_status,</if> |
|||
<if test="makeNo != null">makeNo,</if> |
|||
<if test="saleNo != null">saleNo,</if> |
|||
<if test="Salesman != null">Salesman,</if> |
|||
<if test="customerId != null">customerId,</if> |
|||
<if test="customerName != null">customerName,</if> |
|||
<if test="customerOderCode != null">customerOderCode,</if> |
|||
<if test="material != null">material,</if> |
|||
<if test="materialSum != null">materialSum,</if> |
|||
<if test="finishNum != null">finishNum,</if> |
|||
<if test="eceiptNum != null">eceiptNum,</if> |
|||
<if test="noRate != null">noRate,</if> |
|||
<if test="rate != null">rate,</if> |
|||
<if test="createBy != null">create_by,</if> |
|||
<if test="createTime != null">create_time,</if> |
|||
<if test="updateBy != null">update_by,</if> |
|||
<if test="updateTime != null">update_time,</if> |
|||
<if test="remark != null">remark,</if> |
|||
<if test="delFlag != null">del_flag,</if> |
|||
</trim> |
|||
<trim prefix="values (" suffix=")" suffixOverrides=","> |
|||
<if test="makeStatus != null">#{makeStatus},</if> |
|||
<if test="eceiptStatus != null">#{eceiptStatus},</if> |
|||
<if test="qualityStatus != null">#{qualityStatus},</if> |
|||
<if test="useStatus != null">#{useStatus},</if> |
|||
<if test="makeNo != null">#{makeNo},</if> |
|||
<if test="saleNo != null">#{saleNo},</if> |
|||
<if test="Salesman != null">#{Salesman},</if> |
|||
<if test="customerId != null">#{customerId},</if> |
|||
<if test="customerName != null">#{customerName},</if> |
|||
<if test="customerOderCode != null">#{customerOderCode},</if> |
|||
<if test="material != null">#{material},</if> |
|||
<if test="materialSum != null">#{materialSum},</if> |
|||
<if test="finishNum != null">#{finishNum},</if> |
|||
<if test="eceiptNum != null">#{eceiptNum},</if> |
|||
<if test="noRate != null">#{noRate},</if> |
|||
<if test="rate != null">#{rate},</if> |
|||
<if test="createBy != null">#{createBy},</if> |
|||
<if test="createTime != null">#{createTime},</if> |
|||
<if test="updateBy != null">#{updateBy},</if> |
|||
<if test="updateTime != null">#{updateTime},</if> |
|||
<if test="remark != null">#{remark},</if> |
|||
<if test="delFlag != null">#{delFlag},</if> |
|||
</trim> |
|||
</insert> |
|||
|
|||
<update id="updateSysMakeOrder" parameterType="SysMakeOrder"> |
|||
update sys_makeorder |
|||
<trim prefix="SET" suffixOverrides=","> |
|||
<if test="makeStatus != null">make_status = #{makeStatus},</if> |
|||
<if test="eceiptStatus != null">eceipt_status = #{eceiptStatus},</if> |
|||
<if test="qualityStatus != null">quality_status = #{qualityStatus},</if> |
|||
<if test="useStatus != null">use_status = #{useStatus},</if> |
|||
<if test="makeNo != null">makeNo = #{makeNo},</if> |
|||
<if test="saleNo != null">saleNo = #{saleNo},</if> |
|||
<if test="Salesman != null">Salesman = #{Salesman},</if> |
|||
<if test="customerId != null">customerId = #{customerId},</if> |
|||
<if test="customerName != null">customerName = #{customerName},</if> |
|||
<if test="customerOderCode != null">customerOderCode = #{customerOderCode},</if> |
|||
<if test="material != null">material = #{material},</if> |
|||
<if test="materialSum != null">materialSum = #{materialSum},</if> |
|||
<if test="finishNum != null">finishNum = #{finishNum},</if> |
|||
<if test="eceiptNum != null">eceiptNum = #{eceiptNum},</if> |
|||
<if test="noRate != null">noRate = #{noRate},</if> |
|||
<if test="rate != null">rate = #{rate},</if> |
|||
<if test="createBy != null">create_by = #{createBy},</if> |
|||
<if test="createTime != null">create_time = #{createTime},</if> |
|||
<if test="updateBy != null">update_by = #{updateBy},</if> |
|||
<if test="updateTime != null">update_time = #{updateTime},</if> |
|||
<if test="remark != null">remark = #{remark},</if> |
|||
<if test="delFlag != null">del_flag = #{delFlag},</if> |
|||
</trim> |
|||
where id = #{id} |
|||
</update> |
|||
|
|||
<delete id="deleteSysMakeOrderById" parameterType="Long"> |
|||
delete from sys_makeorder where id = #{id} |
|||
</delete> |
|||
|
|||
<delete id="deleteSysMakeOrderByIds" parameterType="String"> |
|||
delete from sys_makeorder where id in |
|||
<foreach item="id" collection="array" open="(" separator="," close=")"> |
|||
#{id} |
|||
</foreach> |
|||
</delete> |
|||
|
|||
<update id="cancelSysMakeOrderById" parameterType="Long"> |
|||
update sys_makeorder set del_flag = '1' where id = #{id} |
|||
</update> |
|||
|
|||
<update id="restoreSysMakeOrderById" parameterType="Long"> |
|||
update sys_makeorder set del_flag = '0' where id = #{id} |
|||
</update> |
|||
|
|||
</mapper> |
|||
@ -0,0 +1,120 @@ |
|||
<?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.system.mapper.SysPickingMapper"> |
|||
|
|||
<resultMap type="SysPicking" id="SysPickingResult"> |
|||
<result property="pickId" column="pickId" /> |
|||
<result property="pickNo" column="pickNo" /> |
|||
<result property="pickStaus" column="pickStaus" /> |
|||
<result property="createBy" column="create_by" /> |
|||
<result property="saleNo" column="saleNo" /> |
|||
<result property="types" column="types" /> |
|||
<result property="materialM" column="materialM" /> |
|||
<result property="materialSum" column="materialSum" /> |
|||
<result property="createTime" column="create_time" /> |
|||
<result property="updateBy" column="update_by" /> |
|||
<result property="updateTime" column="update_time" /> |
|||
<result property="opers" column="opers" /> |
|||
<result property="remark" column="remark" /> |
|||
<result property="pickBy" column="pick_by" /> |
|||
</resultMap> |
|||
|
|||
<sql id="selectSysPickingVo"> |
|||
select pickId, pickNo, pickStaus, create_by, saleNo, types, materialM, materialSum, create_time, update_by, update_time, opers, remark, pick_by from sys_picking |
|||
</sql> |
|||
|
|||
<select id="selectSysPickingList" parameterType="SysPicking" resultMap="SysPickingResult"> |
|||
<include refid="selectSysPickingVo"/> |
|||
<where> |
|||
<if test="pickNo != null and pickNo != ''"> and pickNo = #{pickNo}</if> |
|||
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if> |
|||
<if test="saleNo != null and saleNo != ''"> and saleNo = #{saleNo}</if> |
|||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if> |
|||
<if test="opers != null and opers != ''"> and opers = #{opers}</if> |
|||
<if test="pickBy != null and pickBy != ''"> and pick_by = #{pickBy}</if> |
|||
</where> |
|||
</select> |
|||
|
|||
<select id="selectSysPickingById" parameterType="Long" resultMap="SysPickingResult"> |
|||
<include refid="selectSysPickingVo"/> |
|||
where pickId = #{pickId} |
|||
</select> |
|||
|
|||
<insert id="insertSysPicking" parameterType="SysPicking"> |
|||
insert into sys_picking |
|||
<trim prefix="(" suffix=")" suffixOverrides=","> |
|||
<if test="pickId != null">pickId,</if> |
|||
<if test="pickNo != null">pickNo,</if> |
|||
<if test="pickStaus != null">pickStaus,</if> |
|||
<if test="createBy != null">create_by,</if> |
|||
<if test="saleNo != null">saleNo,</if> |
|||
<if test="types != null">types,</if> |
|||
<if test="materialM != null">materialM,</if> |
|||
<if test="materialSum != null">materialSum,</if> |
|||
<if test="createTime != null">create_time,</if> |
|||
<if test="updateBy != null">update_by,</if> |
|||
<if test="updateTime != null">update_time,</if> |
|||
<if test="opers != null">opers,</if> |
|||
<if test="remark != null">remark,</if> |
|||
<if test="pickBy != null">pick_by,</if> |
|||
</trim> |
|||
<trim prefix="values (" suffix=")" suffixOverrides=","> |
|||
<if test="pickId != null">#{pickId},</if> |
|||
<if test="pickNo != null">#{pickNo},</if> |
|||
<if test="pickStaus != null">#{pickStaus},</if> |
|||
<if test="createBy != null">#{createBy},</if> |
|||
<if test="saleNo != null">#{saleNo},</if> |
|||
<if test="types != null">#{types},</if> |
|||
<if test="materialM != null">#{materialM},</if> |
|||
<if test="materialSum != null">#{materialSum},</if> |
|||
<if test="createTime != null">#{createTime},</if> |
|||
<if test="updateBy != null">#{updateBy},</if> |
|||
<if test="updateTime != null">#{updateTime},</if> |
|||
<if test="opers != null">#{opers},</if> |
|||
<if test="remark != null">#{remark},</if> |
|||
<if test="pickBy != null">#{pickBy},</if> |
|||
</trim> |
|||
</insert> |
|||
|
|||
<update id="updateSysPicking" parameterType="SysPicking"> |
|||
update sys_picking |
|||
<trim prefix="SET" suffixOverrides=","> |
|||
<if test="pickNo != null">pickNo = #{pickNo},</if> |
|||
<if test="pickStaus != null">pickStaus = #{pickStaus},</if> |
|||
<if test="createBy != null">create_by = #{createBy},</if> |
|||
<if test="saleNo != null">saleNo = #{saleNo},</if> |
|||
<if test="types != null">types = #{types},</if> |
|||
<if test="materialM != null">materialM = #{materialM},</if> |
|||
<if test="materialSum != null">materialSum = #{materialSum},</if> |
|||
<if test="createTime != null">create_time = #{createTime},</if> |
|||
<if test="updateBy != null">update_by = #{updateBy},</if> |
|||
<if test="updateTime != null">update_time = #{updateTime},</if> |
|||
<if test="opers != null">opers = #{opers},</if> |
|||
<if test="remark != null">remark = #{remark},</if> |
|||
<if test="pickBy != null">pick_by = #{pickBy},</if> |
|||
</trim> |
|||
where pickId = #{pickId} |
|||
</update> |
|||
|
|||
<delete id="deleteSysPickingById" parameterType="Long"> |
|||
delete from sys_picking where pickId = #{pickId} |
|||
</delete> |
|||
|
|||
<delete id="deleteSysPickingByIds" parameterType="String"> |
|||
delete from sys_picking where pickId in |
|||
<foreach item="pickId" collection="array" open="(" separator="," close=")"> |
|||
#{pickId} |
|||
</foreach> |
|||
</delete> |
|||
|
|||
<update id="cancelSysPickingById" parameterType="Long"> |
|||
update sys_picking set del_flag = '1' where pickId = #{pickId} |
|||
</update> |
|||
|
|||
<update id="restoreSysPickingById" parameterType="Long"> |
|||
update sys_picking set del_flag = '0' where pickId = #{pickId} |
|||
</update> |
|||
|
|||
</mapper> |
|||
@ -0,0 +1,114 @@ |
|||
<?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.system.mapper.SysProductModelMapper"> |
|||
<resultMap type="SysProductModel" id="SysProductModelResult"> |
|||
<result property="Pid" column="Pid" /> |
|||
<result property="Pcode" column="Pcode" /> |
|||
<result property="createBy" column="create_by" /> |
|||
<result property="equipModel" column="equipModel" /> |
|||
<result property="equipName" column="equipName" /> |
|||
<result property="specification" column="specification" /> |
|||
<result property="differences" column="differences" /> |
|||
<result property="remark" column="remark" /> |
|||
<result property="createTime" column="create_time" /> |
|||
<result property="udpateBy" column="udpate_by" /> |
|||
<result property="updateTime" column="update_time" /> |
|||
<result property="photoUrl" column="photoUrl" /> |
|||
</resultMap> |
|||
|
|||
<sql id="selectSysProductModelVo"> |
|||
select Pid, Pcode, create_by, equipModel, equipName, specification, differences, remark, create_time, udpate_by, update_time, photoUrl from sys_product_model |
|||
</sql> |
|||
|
|||
<select id="selectSysProductModelList" parameterType="SysProductModel" resultMap="SysProductModelResult"> |
|||
<include refid="selectSysProductModelVo"/> |
|||
<where> |
|||
<if test="Pcode != null and Pcode != ''"> and Pcode = #{Pcode}</if> |
|||
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if> |
|||
<if test="equipModel != null and equipModel != ''"> and equipModel = #{equipModel}</if> |
|||
<if test="equipName != null and equipName != ''"> and equipName like concat('%', #{equipName}, '%')</if> |
|||
<if test="specification != null and specification != ''"> and specification = #{specification}</if> |
|||
<if test="differences != null and differences != ''"> and differences = #{differences}</if> |
|||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if> |
|||
<if test="udpateBy != null and udpateBy != ''"> and udpate_by = #{udpateBy}</if> |
|||
<if test="photoUrl != null and photoUrl != ''"> and photoUrl = #{photoUrl}</if> |
|||
</where> |
|||
</select> |
|||
|
|||
<select id="selectSysProductModelById" parameterType="Long" resultMap="SysProductModelResult"> |
|||
<include refid="selectSysProductModelVo"/> |
|||
where Pid = #{Pid} |
|||
</select> |
|||
|
|||
<insert id="insertSysProductModel" parameterType="SysProductModel"> |
|||
insert into sys_product_model |
|||
<trim prefix="(" suffix=")" suffixOverrides=","> |
|||
<if test="Pid != null">Pid,</if> |
|||
<if test="Pcode != null">Pcode,</if> |
|||
<if test="createBy != null">create_by,</if> |
|||
<if test="equipModel != null">equipModel,</if> |
|||
<if test="equipName != null">equipName,</if> |
|||
<if test="specification != null">specification,</if> |
|||
<if test="differences != null">differences,</if> |
|||
<if test="remark != null">remark,</if> |
|||
<if test="createTime != null">create_time,</if> |
|||
<if test="udpateBy != null">udpate_by,</if> |
|||
<if test="updateTime != null">update_time,</if> |
|||
<if test="photoUrl != null">photoUrl,</if> |
|||
</trim> |
|||
<trim prefix="values (" suffix=")" suffixOverrides=","> |
|||
<if test="Pid != null">#{Pid},</if> |
|||
<if test="Pcode != null">#{Pcode},</if> |
|||
<if test="createBy != null">#{createBy},</if> |
|||
<if test="equipModel != null">#{equipModel},</if> |
|||
<if test="equipName != null">#{equipName},</if> |
|||
<if test="specification != null">#{specification},</if> |
|||
<if test="differences != null">#{differences},</if> |
|||
<if test="remark != null">#{remark},</if> |
|||
<if test="createTime != null">#{createTime},</if> |
|||
<if test="udpateBy != null">#{udpateBy},</if> |
|||
<if test="updateTime != null">#{updateTime},</if> |
|||
<if test="photoUrl != null">#{photoUrl},</if> |
|||
</trim> |
|||
</insert> |
|||
|
|||
<update id="updateSysProductModel" parameterType="SysProductModel"> |
|||
update sys_product_model |
|||
<trim prefix="SET" suffixOverrides=","> |
|||
<if test="Pcode != null">Pcode = #{Pcode},</if> |
|||
<if test="createBy != null">create_by = #{createBy},</if> |
|||
<if test="equipModel != null">equipModel = #{equipModel},</if> |
|||
<if test="equipName != null">equipName = #{equipName},</if> |
|||
<if test="specification != null">specification = #{specification},</if> |
|||
<if test="differences != null">differences = #{differences},</if> |
|||
<if test="remark != null">remark = #{remark},</if> |
|||
<if test="createTime != null">create_time = #{createTime},</if> |
|||
<if test="udpateBy != null">udpate_by = #{udpateBy},</if> |
|||
<if test="updateTime != null">update_time = #{updateTime},</if> |
|||
<if test="photoUrl != null">photoUrl = #{photoUrl},</if> |
|||
</trim> |
|||
where Pid = #{Pid} |
|||
</update> |
|||
|
|||
<delete id="deleteSysProductModelById" parameterType="Long"> |
|||
delete from sys_product_model where Pid = #{Pid} |
|||
</delete> |
|||
|
|||
<delete id="deleteSysProductModelByIds" parameterType="String"> |
|||
delete from sys_product_model where Pid in |
|||
<foreach item="Pid" collection="array" open="(" separator="," close=")"> |
|||
#{Pid} |
|||
</foreach> |
|||
</delete> |
|||
|
|||
<update id="cancelSysProductModelById" parameterType="Long"> |
|||
update sys_product_model set del_flag = '1' where Pid = #{Pid} |
|||
</update> |
|||
|
|||
<update id="restoreSysProductModelById" parameterType="Long"> |
|||
update sys_product_model set del_flag = '0' where Pid = #{Pid} |
|||
</update> |
|||
|
|||
</mapper> |
|||
@ -0,0 +1,143 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('bom对比')" /> |
|||
<th:block th:include="include :: select2-css" /> |
|||
<th:block th:include="include :: bootstrap-editable-css" /> |
|||
|
|||
|
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-bom-add"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-4 control-label is-required">第一项 bom号:</label> |
|||
<div class="col-sm-4"> |
|||
<select class="form-control m-b select2-multiple" id="bomNo1" name="bomNo" required> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-4 control-label is-required">第二项 bom号</label> |
|||
<div class="col-sm-4"> |
|||
<select class="form-control m-b select2-multiple" id="bomNo2" name="bomNo" required> |
|||
</select> |
|||
</div> |
|||
<div class="btn-group-sm" id="toolbar" role="row"> |
|||
<a class="btn btn-success" onclick="seacher()"> |
|||
<i class="fa fa-plus"></i> 搜索 |
|||
</a> |
|||
<a class="btn btn-danger multiple disabled" onclick="refresh()"> |
|||
<i class="fa fa-remove"></i> 重置 |
|||
</a> |
|||
</div> |
|||
</div> |
|||
|
|||
<div class="col-sm-12"> |
|||
<div class="row"> |
|||
<div class="col-xs-6"> |
|||
<input class="form-control" name="bomNo" id="bom1-t"> |
|||
</div> |
|||
<div class="col-xs-6"> |
|||
<input class="form-control" name="bomNo" id="bom2-t"> |
|||
</div> |
|||
</div> |
|||
<div class="col-xs-12" id="bom-to"> |
|||
|
|||
</div> |
|||
</div> |
|||
<div class="col-sm-12"> |
|||
<h5 class="form-control">相同项</h5> |
|||
<div class="row"> |
|||
<div class="col-xs-6" id="bom-ton"> |
|||
|
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="col-sm-12"> |
|||
<h5 class="form-control">不同项</h5> |
|||
<div class="row"> |
|||
<div class="col-xs-6" id="bom1-dif"> |
|||
左列内容 |
|||
</div> |
|||
<div class="col-xs-6" id="bom2-dif"> |
|||
右列内容 |
|||
</div> |
|||
</div> |
|||
</div> |
|||
|
|||
</form> |
|||
|
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: bootstrap-table-editable-js" /> |
|||
<th:block th:include="include :: select2-js" /> |
|||
|
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "erp/bom" |
|||
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
|||
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
|||
var bomLevelSelectDatas = [[${@dict.getTypeSelect('bomLevel')}]]; |
|||
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
|||
$("#form-bom-add").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
$("#bomNo1","#bomNo2").select2({ |
|||
allowClear: true, |
|||
placeholder: "请选择bom", |
|||
ajax:{ |
|||
type: "post", |
|||
url:ctx + "erp/bom/list", |
|||
dataType:"json", |
|||
delay:250, |
|||
cache:true, |
|||
processResults: function (res, params) { |
|||
var resultList = res.rows; |
|||
console.log("传输的数值"); |
|||
console.log(resultList); |
|||
var options = []; |
|||
for(var i= 0, len=resultList.length;i<len;i++){ |
|||
var option = resultList[i]; |
|||
option.id = resultList[i]["bomNo"]; |
|||
option.text = resultList[i]["bomNo"]; |
|||
options.push(option); |
|||
} |
|||
return { |
|||
results: options, |
|||
pagination: { |
|||
// more:res["data"]["more"] |
|||
} |
|||
}; |
|||
}, |
|||
escapeMarkup: function (markup) { return markup; }, |
|||
// minimumInputLength: 1 |
|||
} |
|||
}); |
|||
function seacher(){ |
|||
$.ajax({ |
|||
url: ctx + "equalsBom", |
|||
method:'post', |
|||
data:{ |
|||
bomNo1:$("bomNo1").val(), |
|||
bomNo2:$("bomNo2").val() |
|||
}, |
|||
success:function (res){ |
|||
console.log(res); |
|||
for (let i = 0; i < res.data.bomList; i++) { |
|||
$('#bom-ton').join(''); |
|||
} |
|||
|
|||
}, |
|||
error:function (res){ |
|||
|
|||
}, |
|||
}) |
|||
} |
|||
function refresh(){ |
|||
$("bomNo1").val(''); |
|||
$("bomNo2").val(''); |
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,141 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('新增生产订单')" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-makeorder-add"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">生产状态：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="makeStatus" class="form-control m-b" th:with="type=${@dict.getType('sys_erp_makeStatus')}"> |
|||
<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"> |
|||
<select name="eceiptStatus" class="form-control m-b" th:with="type=${@dict.getType('eceiptStatus')}"> |
|||
<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"> |
|||
<select name="qualityStatus" class="form-control m-b" th:with="type=${@dict.getType('qualityStatus')}"> |
|||
<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"> |
|||
<select name="useStatus" class="form-control m-b" th:with="type=${@dict.getType('useStatus')}"> |
|||
<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="makeNo" 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="saleNo" 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="Salesman" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">客户ID：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="customerId" 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="customerName" 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="customerOderCode" 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="material" 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="materialSum" 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="finishNum" 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="eceiptNum" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">不含税生产成本(RMB)：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="noRate" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">含税生产成本(RMB)：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="rate" 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="remark" 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="delFlag" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "system/makeorder" |
|||
$("#form-makeorder-add").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/add", $('#form-makeorder-add').serialize()); |
|||
} |
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,136 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('修改生产订单')" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-makeorder-edit" th:object="${sysMakeOrder}"> |
|||
<input name="id" th:field="*{id}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">生产状态：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="makeStatus" class="form-control m-b" th:with="type=${@dict.getType('sys_erp_makeStatus')}"> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{makeStatus}"></option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">入库状态：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="eceiptStatus" class="form-control m-b" th:with="type=${@dict.getType('eceiptStatus')}"> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{eceiptStatus}"></option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">品质状态：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="qualityStatus" class="form-control m-b" th:with="type=${@dict.getType('qualityStatus')}"> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{qualityStatus}"></option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">使用状态：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="useStatus" class="form-control m-b" th:with="type=${@dict.getType('useStatus')}"> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{useStatus}"></option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">生产订单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="makeNo" th:field="*{makeNo}" 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="saleNo" th:field="*{saleNo}" 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="Salesman" th:field="*{Salesman}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">客户ID：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="customerId" th:field="*{customerId}" 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="customerName" th:field="*{customerName}" 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="customerOderCode" th:field="*{customerOderCode}" 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="material" th:field="*{material}" 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="materialSum" th:field="*{materialSum}" 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="finishNum" th:field="*{finishNum}" 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="eceiptNum" th:field="*{eceiptNum}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">不含税生产成本(RMB)：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="noRate" th:field="*{noRate}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">含税生产成本(RMB)：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="rate" th:field="*{rate}" 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="remark" th:field="*{remark}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "system/makeorder"; |
|||
$("#form-makeorder-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/edit", $('#form-makeorder-edit').serialize()); |
|||
} |
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,229 @@ |
|||
<!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> |
|||
<select name="makeStatus" th:with="type=${@dict.getType('sys_erp_makeStatus')}"> |
|||
<option value="">所有</option> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
|||
</select> |
|||
</li> |
|||
<li> |
|||
<label>入库状态：</label> |
|||
<select name="eceiptStatus" th:with="type=${@dict.getType('eceiptStatus')}"> |
|||
<option value="">所有</option> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
|||
</select> |
|||
</li> |
|||
<li> |
|||
<label>品质状态：</label> |
|||
<select name="qualityStatus" th:with="type=${@dict.getType('qualityStatus')}"> |
|||
<option value="">所有</option> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
|||
</select> |
|||
</li> |
|||
<li> |
|||
<label>使用状态：</label> |
|||
<select name="useStatus" th:with="type=${@dict.getType('useStatus')}"> |
|||
<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="makeNo"/> |
|||
</li> |
|||
<li> |
|||
<label>关联销售订单号：</label> |
|||
<input type="text" name="saleNo"/> |
|||
</li> |
|||
<li> |
|||
<label>业务员：</label> |
|||
<input type="text" name="Salesman"/> |
|||
</li> |
|||
<li> |
|||
<label>客户ID：</label> |
|||
<input type="text" name="customerId"/> |
|||
</li> |
|||
<li> |
|||
<label>客户名称：</label> |
|||
<input type="text" name="customerName"/> |
|||
</li> |
|||
<li> |
|||
<label>客户订单号：</label> |
|||
<input type="text" name="customerOderCode"/> |
|||
</li> |
|||
<li class="select-time"> |
|||
<label>录入时间：</label> |
|||
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> |
|||
<span>-</span> |
|||
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> |
|||
</li> |
|||
<li> |
|||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
|||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</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="system:makeorder:add"> |
|||
<i class="fa fa-plus"></i> 添加 |
|||
</a> |
|||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:makeorder:edit"> |
|||
<i class="fa fa-edit"></i> 修改 |
|||
</a> |
|||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:makeorder:remove"> |
|||
<i class="fa fa-remove"></i> 删除 |
|||
</a> |
|||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:makeorder: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('system:makeorder:edit')}]]; |
|||
var removeFlag = [[${@permission.hasPermi('system:makeorder:remove')}]]; |
|||
var cancelFlag = [[${@permission.hasPermi('system:makeorder:cancel')}]]; |
|||
var restoreFlag = [[${@permission.hasPermi('system:makeorder:restore')}]]; |
|||
var makeStatusDatas = [[${@dict.getType('sys_erp_makeStatus')}]]; |
|||
var eceiptStatusDatas = [[${@dict.getType('eceiptStatus')}]]; |
|||
var qualityStatusDatas = [[${@dict.getType('qualityStatus')}]]; |
|||
var useStatusDatas = [[${@dict.getType('useStatus')}]]; |
|||
var prefix = ctx + "system/makeorder"; |
|||
|
|||
$(function() { |
|||
var options = { |
|||
url: prefix + "/list", |
|||
createUrl: prefix + "/add", |
|||
updateUrl: prefix + "/edit/{id}", |
|||
removeUrl: prefix + "/remove", |
|||
cancelUrl: prefix + "/cancel/{id}", |
|||
restoreUrl: prefix + "/restore/{id}", |
|||
exportUrl: prefix + "/export", |
|||
modalName: "生产订单", |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
field: 'id', |
|||
title: '生产订单id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'makeStatus', |
|||
title: '生产状态', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(makeStatusDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'eceiptStatus', |
|||
title: '入库状态', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(eceiptStatusDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'qualityStatus', |
|||
title: '品质状态', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(qualityStatusDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'useStatus', |
|||
title: '使用状态', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(useStatusDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'makeNo', |
|||
title: '生产订单号' |
|||
}, |
|||
{ |
|||
field: 'saleNo', |
|||
title: '关联销售订单号' |
|||
}, |
|||
{ |
|||
field: 'Salesman', |
|||
title: '业务员' |
|||
}, |
|||
{ |
|||
field: 'customerId', |
|||
title: '客户ID' |
|||
}, |
|||
{ |
|||
field: 'customerName', |
|||
title: '客户名称' |
|||
}, |
|||
{ |
|||
field: 'customerOderCode', |
|||
title: '客户订单号' |
|||
}, |
|||
{ |
|||
field: 'material', |
|||
title: '物料合计' |
|||
}, |
|||
{ |
|||
field: 'materialSum', |
|||
title: '数量合计' |
|||
}, |
|||
{ |
|||
field: 'finishNum', |
|||
title: '已完成数量' |
|||
}, |
|||
{ |
|||
field: 'eceiptNum', |
|||
title: '已入库数量' |
|||
}, |
|||
{ |
|||
field: 'noRate', |
|||
title: '不含税生产成本(RMB)' |
|||
}, |
|||
{ |
|||
field: 'rate', |
|||
title: '含税生产成本(RMB)' |
|||
}, |
|||
{ |
|||
field: 'remark', |
|||
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.id + '\')"><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.id + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|||
if(row.delFlag == '0'){ |
|||
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> '); |
|||
}else{ |
|||
actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> '); |
|||
} |
|||
return actions.join(''); |
|||
} |
|||
}] |
|||
}; |
|||
$.table.init(options); |
|||
}); |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,73 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('新增产品型号管理')" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-model-add"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">产品型号ID：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="Pcode" 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="equipModel" 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="equipName" 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="specification" 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="differences" 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="remark" 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="udpateBy" 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="photoUrl" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "system/model" |
|||
$("#form-model-add").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/add", $('#form-model-add').serialize()); |
|||
} |
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,74 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('修改产品型号管理')" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-model-edit" th:object="${sysProductModel}"> |
|||
<input name="Pid" th:field="*{Pid}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">产品型号ID：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="Pcode" th:field="*{Pcode}" 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="equipModel" th:field="*{equipModel}" 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="equipName" th:field="*{equipName}" 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="specification" th:field="*{specification}" 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="differences" th:field="*{differences}" 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="remark" th:field="*{remark}" 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="udpateBy" th:field="*{udpateBy}" 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="photoUrl" th:field="*{photoUrl}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "system/model"; |
|||
$("#form-model-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/edit", $('#form-model-edit').serialize()); |
|||
} |
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,161 @@ |
|||
<!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>产品型号ID：</label> |
|||
<input type="text" name="Pcode"/> |
|||
</li> |
|||
<li> |
|||
<label>工程员：</label> |
|||
<input type="text" name="createBy"/> |
|||
</li> |
|||
<li> |
|||
<label>设备型号：</label> |
|||
<input type="text" name="equipModel"/> |
|||
</li> |
|||
<li> |
|||
<label>设备名称：</label> |
|||
<input type="text" name="equipName"/> |
|||
</li> |
|||
<li> |
|||
<label>规格说明：</label> |
|||
<input type="text" name="specification"/> |
|||
</li> |
|||
<li> |
|||
<label>差异说明：</label> |
|||
<input type="text" name="differences"/> |
|||
</li> |
|||
<li class="select-time"> |
|||
<label>录入时间：</label> |
|||
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> |
|||
<span>-</span> |
|||
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> |
|||
</li> |
|||
<li> |
|||
<label>更新人：</label> |
|||
<input type="text" name="udpateBy"/> |
|||
</li> |
|||
<li> |
|||
<label>图片地址：</label> |
|||
<input type="text" name="photoUrl"/> |
|||
</li> |
|||
<li> |
|||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
|||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</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="system:model:add"> |
|||
<i class="fa fa-plus"></i> 添加 |
|||
</a> |
|||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:model:edit"> |
|||
<i class="fa fa-edit"></i> 修改 |
|||
</a> |
|||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:model:remove"> |
|||
<i class="fa fa-remove"></i> 删除 |
|||
</a> |
|||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:model: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('system:model:edit')}]]; |
|||
var removeFlag = [[${@permission.hasPermi('system:model:remove')}]]; |
|||
var cancelFlag = [[${@permission.hasPermi('system:model:cancel')}]]; |
|||
var restoreFlag = [[${@permission.hasPermi('system:model:restore')}]]; |
|||
var prefix = ctx + "system/model"; |
|||
|
|||
$(function() { |
|||
var options = { |
|||
url: prefix + "/list", |
|||
createUrl: prefix + "/add", |
|||
updateUrl: prefix + "/edit/{id}", |
|||
removeUrl: prefix + "/remove", |
|||
cancelUrl: prefix + "/cancel/{id}", |
|||
restoreUrl: prefix + "/restore/{id}", |
|||
exportUrl: prefix + "/export", |
|||
modalName: "产品型号管理", |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
field: 'Pid', |
|||
title: '产品型号管理表id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'Pcode', |
|||
title: '产品型号ID' |
|||
}, |
|||
{ |
|||
field: 'createBy', |
|||
title: '工程员' |
|||
}, |
|||
{ |
|||
field: 'equipModel', |
|||
title: '设备型号' |
|||
}, |
|||
{ |
|||
field: 'equipName', |
|||
title: '设备名称' |
|||
}, |
|||
{ |
|||
field: 'specification', |
|||
title: '规格说明' |
|||
}, |
|||
{ |
|||
field: 'differences', |
|||
title: '差异说明' |
|||
}, |
|||
{ |
|||
field: 'remark', |
|||
title: '备注' |
|||
}, |
|||
{ |
|||
field: 'udpateBy', |
|||
title: '更新人' |
|||
}, |
|||
{ |
|||
field: 'photoUrl', |
|||
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.Pid + '\')"><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.Pid + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|||
if(row.delFlag == '0'){ |
|||
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> '); |
|||
}else{ |
|||
actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> '); |
|||
} |
|||
return actions.join(''); |
|||
} |
|||
}] |
|||
}; |
|||
$.table.init(options); |
|||
}); |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,79 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('新增开发修改单领料列表')" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-picking-add"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">领料单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="pickNo" 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="pickStaus" 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="saleNo" 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="types" 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="materialM" 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="materialSum" 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="opers" 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="remark" 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="pickBy" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "system/picking" |
|||
$("#form-picking-add").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/add", $('#form-picking-add').serialize()); |
|||
} |
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,68 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('修改开发修改单领料列表')" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-picking-edit" th:object="${sysPicking}"> |
|||
<input name="pickId" th:field="*{pickId}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">领料单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="pickNo" th:field="*{pickNo}" 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="saleNo" th:field="*{saleNo}" 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="types" th:field="*{types}" 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="materialM" th:field="*{materialM}" 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="materialSum" th:field="*{materialSum}" 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="remark" th:field="*{remark}" 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="pickBy" th:field="*{pickBy}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "system/picking"; |
|||
$("#form-picking-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/edit", $('#form-picking-edit').serialize()); |
|||
} |
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,161 @@ |
|||
<!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="pickNo"/> |
|||
</li> |
|||
<li> |
|||
<label>领料员：</label> |
|||
<input type="text" name="createBy"/> |
|||
</li> |
|||
<li> |
|||
<label>关联销售单号：</label> |
|||
<input type="text" name="saleNo"/> |
|||
</li> |
|||
<li class="select-time"> |
|||
<label>录入时间：</label> |
|||
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> |
|||
<span>-</span> |
|||
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> |
|||
</li> |
|||
<li> |
|||
<label>操作：</label> |
|||
<input type="text" name="opers"/> |
|||
</li> |
|||
<li> |
|||
<label>：</label> |
|||
<input type="text" name="pickBy"/> |
|||
</li> |
|||
<li> |
|||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
|||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</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="system:picking:add"> |
|||
<i class="fa fa-plus"></i> 添加 |
|||
</a> |
|||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:picking:edit"> |
|||
<i class="fa fa-edit"></i> 修改 |
|||
</a> |
|||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:picking:remove"> |
|||
<i class="fa fa-remove"></i> 删除 |
|||
</a> |
|||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:picking: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('system:picking:edit')}]]; |
|||
var removeFlag = [[${@permission.hasPermi('system:picking:remove')}]]; |
|||
var cancelFlag = [[${@permission.hasPermi('system:picking:cancel')}]]; |
|||
var restoreFlag = [[${@permission.hasPermi('system:picking:restore')}]]; |
|||
var prefix = ctx + "system/picking"; |
|||
|
|||
$(function() { |
|||
var options = { |
|||
url: prefix + "/list", |
|||
createUrl: prefix + "/add", |
|||
updateUrl: prefix + "/edit/{id}", |
|||
removeUrl: prefix + "/remove", |
|||
cancelUrl: prefix + "/cancel/{id}", |
|||
restoreUrl: prefix + "/restore/{id}", |
|||
exportUrl: prefix + "/export", |
|||
modalName: "开发修改单领料列表", |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
field: 'pickId', |
|||
title: '领料单id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'pickNo', |
|||
title: '领料单号' |
|||
}, |
|||
{ |
|||
field: 'pickStaus', |
|||
title: '领料状态' |
|||
}, |
|||
{ |
|||
field: 'createBy', |
|||
title: '领料员' |
|||
}, |
|||
{ |
|||
field: 'saleNo', |
|||
title: '关联销售单号' |
|||
}, |
|||
{ |
|||
field: 'types', |
|||
title: '类型' |
|||
}, |
|||
{ |
|||
field: 'materialM', |
|||
title: '物料合计' |
|||
}, |
|||
{ |
|||
field: 'materialSum', |
|||
title: '合计量' |
|||
}, |
|||
{ |
|||
field: 'createTime', |
|||
title: '录入时间' |
|||
}, |
|||
{ |
|||
field: 'updateBy', |
|||
title: '更新人' |
|||
}, |
|||
{ |
|||
field: 'updateTime', |
|||
title: '上次更新时间' |
|||
}, |
|||
{ |
|||
field: 'opers', |
|||
title: '操作' |
|||
}, |
|||
{ |
|||
field: 'remark', |
|||
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.pickId + '\')"><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.pickId + '\')"><i class="fa fa-remove"></i>删除</a> '); |
|||
if(row.delFlag == '0'){ |
|||
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> '); |
|||
}else{ |
|||
actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> '); |
|||
} |
|||
return actions.join(''); |
|||
} |
|||
}] |
|||
}; |
|||
$.table.init(options); |
|||
}); |
|||
</script> |
|||
</body> |
|||
</html> |
|||
Loading…
Reference in new issue