9 changed files with 0 additions and 1770 deletions
@ -1,126 +0,0 @@ |
|||
package com.ruoyi.deliveryProgress.controller; |
|||
|
|||
import java.util.List; |
|||
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.GetMapping; |
|||
import org.springframework.web.bind.annotation.PathVariable; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.ResponseBody; |
|||
import com.ruoyi.common.annotation.Log; |
|||
import com.ruoyi.common.enums.BusinessType; |
|||
import com.ruoyi.deliveryProgress.domain.DeliveryProgressInfo; |
|||
import com.ruoyi.deliveryProgress.service.IDeliveryProgressInfoService; |
|||
import com.ruoyi.common.core.controller.BaseController; |
|||
import com.ruoyi.common.core.domain.AjaxResult; |
|||
import com.ruoyi.common.utils.poi.ExcelUtil; |
|||
import com.ruoyi.common.core.page.TableDataInfo; |
|||
|
|||
/** |
|||
* 交货排程Controller |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-02-28 |
|||
*/ |
|||
@Controller |
|||
@RequestMapping("/deliveryProgress/deliveryProgressInfo") |
|||
public class DeliveryProgressInfoController extends BaseController |
|||
{ |
|||
private String prefix = "deliveryProgress/deliveryProgressInfo"; |
|||
|
|||
@Autowired |
|||
private IDeliveryProgressInfoService deliveryProgressInfoService; |
|||
|
|||
@RequiresPermissions("deliveryProgress:deliveryProgressInfo:view") |
|||
@GetMapping() |
|||
public String deliveryProgressInfo() |
|||
{ |
|||
return prefix + "/deliveryProgressInfo"; |
|||
} |
|||
|
|||
/** |
|||
* 查询交货排程列表 |
|||
*/ |
|||
@RequiresPermissions("deliveryProgress:deliveryProgressInfo:list") |
|||
@PostMapping("/list") |
|||
@ResponseBody |
|||
public TableDataInfo list(DeliveryProgressInfo deliveryProgressInfo) |
|||
{ |
|||
startPage(); |
|||
List<DeliveryProgressInfo> list = deliveryProgressInfoService.selectDeliveryProgressInfoList(deliveryProgressInfo); |
|||
return getDataTable(list); |
|||
} |
|||
|
|||
/** |
|||
* 导出交货排程列表 |
|||
*/ |
|||
@RequiresPermissions("deliveryProgress:deliveryProgressInfo:export") |
|||
@Log(title = "交货排程", businessType = BusinessType.EXPORT) |
|||
@PostMapping("/export") |
|||
@ResponseBody |
|||
public AjaxResult export(DeliveryProgressInfo deliveryProgressInfo) |
|||
{ |
|||
List<DeliveryProgressInfo> list = deliveryProgressInfoService.selectDeliveryProgressInfoList(deliveryProgressInfo); |
|||
ExcelUtil<DeliveryProgressInfo> util = new ExcelUtil<DeliveryProgressInfo>(DeliveryProgressInfo.class); |
|||
return util.exportExcel(list, "交货排程数据"); |
|||
} |
|||
|
|||
/** |
|||
* 新增交货排程 |
|||
*/ |
|||
@GetMapping("/add") |
|||
public String add() |
|||
{ |
|||
return prefix + "/add"; |
|||
} |
|||
|
|||
/** |
|||
* 新增保存交货排程 |
|||
*/ |
|||
@RequiresPermissions("deliveryProgress:deliveryProgressInfo:add") |
|||
@Log(title = "交货排程", businessType = BusinessType.INSERT) |
|||
@PostMapping("/add") |
|||
@ResponseBody |
|||
public AjaxResult addSave(DeliveryProgressInfo deliveryProgressInfo) |
|||
{ |
|||
return toAjax(deliveryProgressInfoService.insertDeliveryProgressInfo(deliveryProgressInfo)); |
|||
} |
|||
|
|||
/** |
|||
* 修改交货排程 |
|||
*/ |
|||
@GetMapping("/edit/{deliveryProgressId}") |
|||
public String edit(@PathVariable("deliveryProgressId") Integer deliveryProgressId, ModelMap mmap) |
|||
{ |
|||
DeliveryProgressInfo deliveryProgressInfo = deliveryProgressInfoService.selectDeliveryProgressInfoById(deliveryProgressId); |
|||
mmap.put("deliveryProgressInfo", deliveryProgressInfo); |
|||
return prefix + "/edit"; |
|||
} |
|||
|
|||
/** |
|||
* 修改保存交货排程 |
|||
*/ |
|||
@RequiresPermissions("deliveryProgress:deliveryProgressInfo:edit") |
|||
@Log(title = "交货排程", businessType = BusinessType.UPDATE) |
|||
@PostMapping("/edit") |
|||
@ResponseBody |
|||
public AjaxResult editSave(DeliveryProgressInfo deliveryProgressInfo) |
|||
{ |
|||
return toAjax(deliveryProgressInfoService.updateDeliveryProgressInfo(deliveryProgressInfo)); |
|||
} |
|||
|
|||
/** |
|||
* 删除交货排程 |
|||
*/ |
|||
@RequiresPermissions("deliveryProgress:deliveryProgressInfo:remove") |
|||
@Log(title = "交货排程", businessType = BusinessType.DELETE) |
|||
@PostMapping( "/remove") |
|||
@ResponseBody |
|||
public AjaxResult remove(String ids) |
|||
{ |
|||
return toAjax(deliveryProgressInfoService.deleteDeliveryProgressInfoByIds(ids)); |
|||
} |
|||
} |
|||
@ -1,229 +0,0 @@ |
|||
package com.ruoyi.deliveryProgress.domain; |
|||
|
|||
import org.apache.commons.lang3.builder.ToStringBuilder; |
|||
import org.apache.commons.lang3.builder.ToStringStyle; |
|||
import com.ruoyi.common.annotation.Excel; |
|||
import com.ruoyi.common.core.domain.BaseEntity; |
|||
|
|||
/** |
|||
* 交货排程对象 delivery_progress_info |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-02-28 |
|||
*/ |
|||
public class DeliveryProgressInfo extends BaseEntity |
|||
{ |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** 交货排程id */ |
|||
private Integer deliveryProgressId; |
|||
|
|||
/** 排程编号 */ |
|||
@Excel(name = "排程编号") |
|||
private String deliveryProgressCode; |
|||
|
|||
/** 计划天数 */ |
|||
private String planDays; |
|||
|
|||
/** 制作日期 */ |
|||
@Excel(name = "制作日期") |
|||
private String produceDate; |
|||
|
|||
/** 客户代码 */ |
|||
@Excel(name = "客户代码") |
|||
private String enterpriseCode; |
|||
|
|||
/** 客户名称 */ |
|||
@Excel(name = "客户名称") |
|||
private String enterpriseName; |
|||
|
|||
/** 交货厂区 */ |
|||
@Excel(name = "交货厂区") |
|||
private String deliveryFactory; |
|||
|
|||
/** 开始日期 */ |
|||
@Excel(name = "开始日期") |
|||
private String beginningDate; |
|||
|
|||
/** 截止日期 */ |
|||
@Excel(name = "截止日期") |
|||
private String endingDate; |
|||
|
|||
/** 交货地点 */ |
|||
@Excel(name = "交货地点") |
|||
private String deliveryAddress; |
|||
|
|||
/** 备注内容 */ |
|||
private String deliveryProgressRemark; |
|||
|
|||
/** 业务人员 */ |
|||
@Excel(name = "业务人员") |
|||
private String businessMembers; |
|||
|
|||
/** 确认否 */ |
|||
@Excel(name = "确认否") |
|||
private String confirmOrNot; |
|||
|
|||
/** 确认人 */ |
|||
private String confirmPerson; |
|||
|
|||
/** 确认时间 */ |
|||
private String confirmTime; |
|||
|
|||
public void setDeliveryProgressId(Integer deliveryProgressId) |
|||
{ |
|||
this.deliveryProgressId = deliveryProgressId; |
|||
} |
|||
|
|||
public Integer getDeliveryProgressId() |
|||
{ |
|||
return deliveryProgressId; |
|||
} |
|||
public void setDeliveryProgressCode(String deliveryProgressCode) |
|||
{ |
|||
this.deliveryProgressCode = deliveryProgressCode; |
|||
} |
|||
|
|||
public String getDeliveryProgressCode() |
|||
{ |
|||
return deliveryProgressCode; |
|||
} |
|||
public void setPlanDays(String planDays) |
|||
{ |
|||
this.planDays = planDays; |
|||
} |
|||
|
|||
public String getPlanDays() |
|||
{ |
|||
return planDays; |
|||
} |
|||
public void setProduceDate(String produceDate) |
|||
{ |
|||
this.produceDate = produceDate; |
|||
} |
|||
|
|||
public String getProduceDate() |
|||
{ |
|||
return produceDate; |
|||
} |
|||
public void setEnterpriseCode(String enterpriseCode) |
|||
{ |
|||
this.enterpriseCode = enterpriseCode; |
|||
} |
|||
|
|||
public String getEnterpriseCode() |
|||
{ |
|||
return enterpriseCode; |
|||
} |
|||
public void setEnterpriseName(String enterpriseName) |
|||
{ |
|||
this.enterpriseName = enterpriseName; |
|||
} |
|||
|
|||
public String getEnterpriseName() |
|||
{ |
|||
return enterpriseName; |
|||
} |
|||
public void setDeliveryFactory(String deliveryFactory) |
|||
{ |
|||
this.deliveryFactory = deliveryFactory; |
|||
} |
|||
|
|||
public String getDeliveryFactory() |
|||
{ |
|||
return deliveryFactory; |
|||
} |
|||
public void setBeginningDate(String beginningDate) |
|||
{ |
|||
this.beginningDate = beginningDate; |
|||
} |
|||
|
|||
public String getBeginningDate() |
|||
{ |
|||
return beginningDate; |
|||
} |
|||
public void setEndingDate(String endingDate) |
|||
{ |
|||
this.endingDate = endingDate; |
|||
} |
|||
|
|||
public String getEndingDate() |
|||
{ |
|||
return endingDate; |
|||
} |
|||
public void setDeliveryAddress(String deliveryAddress) |
|||
{ |
|||
this.deliveryAddress = deliveryAddress; |
|||
} |
|||
|
|||
public String getDeliveryAddress() |
|||
{ |
|||
return deliveryAddress; |
|||
} |
|||
public void setDeliveryProgressRemark(String deliveryProgressRemark) |
|||
{ |
|||
this.deliveryProgressRemark = deliveryProgressRemark; |
|||
} |
|||
|
|||
public String getDeliveryProgressRemark() |
|||
{ |
|||
return deliveryProgressRemark; |
|||
} |
|||
public void setBusinessMembers(String businessMembers) |
|||
{ |
|||
this.businessMembers = businessMembers; |
|||
} |
|||
|
|||
public String getBusinessMembers() |
|||
{ |
|||
return businessMembers; |
|||
} |
|||
public void setConfirmOrNot(String confirmOrNot) |
|||
{ |
|||
this.confirmOrNot = confirmOrNot; |
|||
} |
|||
|
|||
public String getConfirmOrNot() |
|||
{ |
|||
return confirmOrNot; |
|||
} |
|||
public void setConfirmPerson(String confirmPerson) |
|||
{ |
|||
this.confirmPerson = confirmPerson; |
|||
} |
|||
|
|||
public String getConfirmPerson() |
|||
{ |
|||
return confirmPerson; |
|||
} |
|||
public void setConfirmTime(String confirmTime) |
|||
{ |
|||
this.confirmTime = confirmTime; |
|||
} |
|||
|
|||
public String getConfirmTime() |
|||
{ |
|||
return confirmTime; |
|||
} |
|||
|
|||
@Override |
|||
public String toString() { |
|||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
|||
.append("deliveryProgressId", getDeliveryProgressId()) |
|||
.append("deliveryProgressCode", getDeliveryProgressCode()) |
|||
.append("planDays", getPlanDays()) |
|||
.append("produceDate", getProduceDate()) |
|||
.append("enterpriseCode", getEnterpriseCode()) |
|||
.append("enterpriseName", getEnterpriseName()) |
|||
.append("deliveryFactory", getDeliveryFactory()) |
|||
.append("beginningDate", getBeginningDate()) |
|||
.append("endingDate", getEndingDate()) |
|||
.append("deliveryAddress", getDeliveryAddress()) |
|||
.append("deliveryProgressRemark", getDeliveryProgressRemark()) |
|||
.append("businessMembers", getBusinessMembers()) |
|||
.append("confirmOrNot", getConfirmOrNot()) |
|||
.append("confirmPerson", getConfirmPerson()) |
|||
.append("confirmTime", getConfirmTime()) |
|||
.toString(); |
|||
} |
|||
} |
|||
@ -1,61 +0,0 @@ |
|||
package com.ruoyi.deliveryProgress.mapper; |
|||
|
|||
import java.util.List; |
|||
import com.ruoyi.deliveryProgress.domain.DeliveryProgressInfo; |
|||
|
|||
/** |
|||
* 交货排程Mapper接口 |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-02-28 |
|||
*/ |
|||
public interface DeliveryProgressInfoMapper |
|||
{ |
|||
/** |
|||
* 查询交货排程 |
|||
* |
|||
* @param deliveryProgressId 交货排程ID |
|||
* @return 交货排程 |
|||
*/ |
|||
public DeliveryProgressInfo selectDeliveryProgressInfoById(Integer deliveryProgressId); |
|||
|
|||
/** |
|||
* 查询交货排程列表 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 交货排程集合 |
|||
*/ |
|||
public List<DeliveryProgressInfo> selectDeliveryProgressInfoList(DeliveryProgressInfo deliveryProgressInfo); |
|||
|
|||
/** |
|||
* 新增交货排程 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 结果 |
|||
*/ |
|||
public int insertDeliveryProgressInfo(DeliveryProgressInfo deliveryProgressInfo); |
|||
|
|||
/** |
|||
* 修改交货排程 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 结果 |
|||
*/ |
|||
public int updateDeliveryProgressInfo(DeliveryProgressInfo deliveryProgressInfo); |
|||
|
|||
/** |
|||
* 删除交货排程 |
|||
* |
|||
* @param deliveryProgressId 交货排程ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteDeliveryProgressInfoById(Integer deliveryProgressId); |
|||
|
|||
/** |
|||
* 批量删除交货排程 |
|||
* |
|||
* @param deliveryProgressIds 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteDeliveryProgressInfoByIds(String[] deliveryProgressIds); |
|||
} |
|||
@ -1,61 +0,0 @@ |
|||
package com.ruoyi.deliveryProgress.service; |
|||
|
|||
import java.util.List; |
|||
import com.ruoyi.deliveryProgress.domain.DeliveryProgressInfo; |
|||
|
|||
/** |
|||
* 交货排程Service接口 |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-02-28 |
|||
*/ |
|||
public interface IDeliveryProgressInfoService |
|||
{ |
|||
/** |
|||
* 查询交货排程 |
|||
* |
|||
* @param deliveryProgressId 交货排程ID |
|||
* @return 交货排程 |
|||
*/ |
|||
public DeliveryProgressInfo selectDeliveryProgressInfoById(Integer deliveryProgressId); |
|||
|
|||
/** |
|||
* 查询交货排程列表 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 交货排程集合 |
|||
*/ |
|||
public List<DeliveryProgressInfo> selectDeliveryProgressInfoList(DeliveryProgressInfo deliveryProgressInfo); |
|||
|
|||
/** |
|||
* 新增交货排程 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 结果 |
|||
*/ |
|||
public int insertDeliveryProgressInfo(DeliveryProgressInfo deliveryProgressInfo); |
|||
|
|||
/** |
|||
* 修改交货排程 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 结果 |
|||
*/ |
|||
public int updateDeliveryProgressInfo(DeliveryProgressInfo deliveryProgressInfo); |
|||
|
|||
/** |
|||
* 批量删除交货排程 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteDeliveryProgressInfoByIds(String ids); |
|||
|
|||
/** |
|||
* 删除交货排程信息 |
|||
* |
|||
* @param deliveryProgressId 交货排程ID |
|||
* @return 结果 |
|||
*/ |
|||
public int deleteDeliveryProgressInfoById(Integer deliveryProgressId); |
|||
} |
|||
@ -1,94 +0,0 @@ |
|||
package com.ruoyi.deliveryProgress.service.impl; |
|||
|
|||
import java.util.List; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
import com.ruoyi.deliveryProgress.mapper.DeliveryProgressInfoMapper; |
|||
import com.ruoyi.deliveryProgress.domain.DeliveryProgressInfo; |
|||
import com.ruoyi.deliveryProgress.service.IDeliveryProgressInfoService; |
|||
import com.ruoyi.common.core.text.Convert; |
|||
|
|||
/** |
|||
* 交货排程Service业务层处理 |
|||
* |
|||
* @author ruoyi |
|||
* @date 2023-02-28 |
|||
*/ |
|||
@Service |
|||
public class DeliveryProgressInfoServiceImpl implements IDeliveryProgressInfoService |
|||
{ |
|||
@Autowired |
|||
private DeliveryProgressInfoMapper deliveryProgressInfoMapper; |
|||
|
|||
/** |
|||
* 查询交货排程 |
|||
* |
|||
* @param deliveryProgressId 交货排程ID |
|||
* @return 交货排程 |
|||
*/ |
|||
@Override |
|||
public DeliveryProgressInfo selectDeliveryProgressInfoById(Integer deliveryProgressId) |
|||
{ |
|||
return deliveryProgressInfoMapper.selectDeliveryProgressInfoById(deliveryProgressId); |
|||
} |
|||
|
|||
/** |
|||
* 查询交货排程列表 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 交货排程 |
|||
*/ |
|||
@Override |
|||
public List<DeliveryProgressInfo> selectDeliveryProgressInfoList(DeliveryProgressInfo deliveryProgressInfo) |
|||
{ |
|||
return deliveryProgressInfoMapper.selectDeliveryProgressInfoList(deliveryProgressInfo); |
|||
} |
|||
|
|||
/** |
|||
* 新增交货排程 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int insertDeliveryProgressInfo(DeliveryProgressInfo deliveryProgressInfo) |
|||
{ |
|||
return deliveryProgressInfoMapper.insertDeliveryProgressInfo(deliveryProgressInfo); |
|||
} |
|||
|
|||
/** |
|||
* 修改交货排程 |
|||
* |
|||
* @param deliveryProgressInfo 交货排程 |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int updateDeliveryProgressInfo(DeliveryProgressInfo deliveryProgressInfo) |
|||
{ |
|||
return deliveryProgressInfoMapper.updateDeliveryProgressInfo(deliveryProgressInfo); |
|||
} |
|||
|
|||
/** |
|||
* 删除交货排程对象 |
|||
* |
|||
* @param ids 需要删除的数据ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int deleteDeliveryProgressInfoByIds(String ids) |
|||
{ |
|||
return deliveryProgressInfoMapper.deleteDeliveryProgressInfoByIds(Convert.toStrArray(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 删除交货排程信息 |
|||
* |
|||
* @param deliveryProgressId 交货排程ID |
|||
* @return 结果 |
|||
*/ |
|||
@Override |
|||
public int deleteDeliveryProgressInfoById(Integer deliveryProgressId) |
|||
{ |
|||
return deliveryProgressInfoMapper.deleteDeliveryProgressInfoById(deliveryProgressId); |
|||
} |
|||
} |
|||
@ -1,112 +0,0 @@ |
|||
<?xml version="1.0" encoding="UTF-8" ?> |
|||
<!DOCTYPE mapper |
|||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
<mapper namespace="com.ruoyi.deliveryProgress.mapper.DeliveryProgressInfoMapper"> |
|||
|
|||
<resultMap type="DeliveryProgressInfo" id="DeliveryProgressInfoResult"> |
|||
<result property="deliveryProgressId" column="delivery_progress_id" /> |
|||
<result property="deliveryProgressCode" column="delivery_progress_code" /> |
|||
<result property="planDays" column="plan_days" /> |
|||
<result property="produceDate" column="produce_date" /> |
|||
<result property="enterpriseCode" column="enterprise_code" /> |
|||
<result property="enterpriseName" column="enterprise_name" /> |
|||
<result property="deliveryFactory" column="delivery_factory" /> |
|||
<result property="beginningDate" column="beginning_date" /> |
|||
<result property="endingDate" column="ending_date" /> |
|||
<result property="deliveryAddress" column="delivery_address" /> |
|||
<result property="deliveryProgressRemark" column="delivery_progress_remark" /> |
|||
<result property="businessMembers" column="business_members" /> |
|||
<result property="confirmOrNot" column="confirm_or_not" /> |
|||
<result property="confirmPerson" column="confirm_person" /> |
|||
<result property="confirmTime" column="confirm_time" /> |
|||
</resultMap> |
|||
|
|||
<sql id="selectDeliveryProgressInfoVo"> |
|||
select delivery_progress_id, delivery_progress_code, plan_days, produce_date, enterprise_code, enterprise_name, delivery_factory, beginning_date, ending_date, delivery_address, delivery_progress_remark, business_members, confirm_or_not, confirm_person, confirm_time from delivery_progress_info |
|||
</sql> |
|||
|
|||
<select id="selectDeliveryProgressInfoList" parameterType="DeliveryProgressInfo" resultMap="DeliveryProgressInfoResult"> |
|||
<include refid="selectDeliveryProgressInfoVo"/> |
|||
<where> |
|||
<if test="deliveryProgressCode != null and deliveryProgressCode != ''"> and delivery_progress_code like concat('%', #{deliveryProgressCode}, '%')</if> |
|||
<if test="enterpriseCode != null and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if> |
|||
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if> |
|||
<if test="confirmOrNot != null and confirmOrNot != ''"> and confirm_or_not = #{confirmOrNot}</if> |
|||
</where> |
|||
</select> |
|||
|
|||
<select id="selectDeliveryProgressInfoById" parameterType="Integer" resultMap="DeliveryProgressInfoResult"> |
|||
<include refid="selectDeliveryProgressInfoVo"/> |
|||
where delivery_progress_id = #{deliveryProgressId} |
|||
</select> |
|||
|
|||
<insert id="insertDeliveryProgressInfo" parameterType="DeliveryProgressInfo" useGeneratedKeys="true" keyProperty="deliveryProgressId"> |
|||
insert into delivery_progress_info |
|||
<trim prefix="(" suffix=")" suffixOverrides=","> |
|||
<if test="deliveryProgressCode != null and deliveryProgressCode != ''">delivery_progress_code,</if> |
|||
<if test="planDays != null">plan_days,</if> |
|||
<if test="produceDate != null">produce_date,</if> |
|||
<if test="enterpriseCode != null and enterpriseCode != ''">enterprise_code,</if> |
|||
<if test="enterpriseName != null and enterpriseName != ''">enterprise_name,</if> |
|||
<if test="deliveryFactory != null">delivery_factory,</if> |
|||
<if test="beginningDate != null">beginning_date,</if> |
|||
<if test="endingDate != null">ending_date,</if> |
|||
<if test="deliveryAddress != null">delivery_address,</if> |
|||
<if test="deliveryProgressRemark != null">delivery_progress_remark,</if> |
|||
<if test="businessMembers != null">business_members,</if> |
|||
<if test="confirmOrNot != null">confirm_or_not,</if> |
|||
<if test="confirmPerson != null">confirm_person,</if> |
|||
<if test="confirmTime != null">confirm_time,</if> |
|||
</trim> |
|||
<trim prefix="values (" suffix=")" suffixOverrides=","> |
|||
<if test="deliveryProgressCode != null and deliveryProgressCode != ''">#{deliveryProgressCode},</if> |
|||
<if test="planDays != null">#{planDays},</if> |
|||
<if test="produceDate != null">#{produceDate},</if> |
|||
<if test="enterpriseCode != null and enterpriseCode != ''">#{enterpriseCode},</if> |
|||
<if test="enterpriseName != null and enterpriseName != ''">#{enterpriseName},</if> |
|||
<if test="deliveryFactory != null">#{deliveryFactory},</if> |
|||
<if test="beginningDate != null">#{beginningDate},</if> |
|||
<if test="endingDate != null">#{endingDate},</if> |
|||
<if test="deliveryAddress != null">#{deliveryAddress},</if> |
|||
<if test="deliveryProgressRemark != null">#{deliveryProgressRemark},</if> |
|||
<if test="businessMembers != null">#{businessMembers},</if> |
|||
<if test="confirmOrNot != null">#{confirmOrNot},</if> |
|||
<if test="confirmPerson != null">#{confirmPerson},</if> |
|||
<if test="confirmTime != null">#{confirmTime},</if> |
|||
</trim> |
|||
</insert> |
|||
|
|||
<update id="updateDeliveryProgressInfo" parameterType="DeliveryProgressInfo"> |
|||
update delivery_progress_info |
|||
<trim prefix="SET" suffixOverrides=","> |
|||
<if test="deliveryProgressCode != null and deliveryProgressCode != ''">delivery_progress_code = #{deliveryProgressCode},</if> |
|||
<if test="planDays != null">plan_days = #{planDays},</if> |
|||
<if test="produceDate != null">produce_date = #{produceDate},</if> |
|||
<if test="enterpriseCode != null and enterpriseCode != ''">enterprise_code = #{enterpriseCode},</if> |
|||
<if test="enterpriseName != null and enterpriseName != ''">enterprise_name = #{enterpriseName},</if> |
|||
<if test="deliveryFactory != null">delivery_factory = #{deliveryFactory},</if> |
|||
<if test="beginningDate != null">beginning_date = #{beginningDate},</if> |
|||
<if test="endingDate != null">ending_date = #{endingDate},</if> |
|||
<if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if> |
|||
<if test="deliveryProgressRemark != null">delivery_progress_remark = #{deliveryProgressRemark},</if> |
|||
<if test="businessMembers != null">business_members = #{businessMembers},</if> |
|||
<if test="confirmOrNot != null">confirm_or_not = #{confirmOrNot},</if> |
|||
<if test="confirmPerson != null">confirm_person = #{confirmPerson},</if> |
|||
<if test="confirmTime != null">confirm_time = #{confirmTime},</if> |
|||
</trim> |
|||
where delivery_progress_id = #{deliveryProgressId} |
|||
</update> |
|||
|
|||
<delete id="deleteDeliveryProgressInfoById" parameterType="Integer"> |
|||
delete from delivery_progress_info where delivery_progress_id = #{deliveryProgressId} |
|||
</delete> |
|||
|
|||
<delete id="deleteDeliveryProgressInfoByIds" parameterType="String"> |
|||
delete from delivery_progress_info where delivery_progress_id in |
|||
<foreach item="deliveryProgressId" collection="array" open="(" separator="," close=")"> |
|||
#{deliveryProgressId} |
|||
</foreach> |
|||
</delete> |
|||
|
|||
</mapper> |
|||
@ -1,756 +0,0 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('新增交货排程')" /> |
|||
<th:block th:include="include :: bootstrap-editable-css"/> |
|||
<th:block th:include="include :: datetimepicker-css" /> |
|||
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet"> |
|||
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet"> |
|||
<style> |
|||
.other-container { |
|||
width: 90%; |
|||
height: 200px; |
|||
margin: auto; |
|||
} |
|||
h4 { |
|||
display: inline-block; |
|||
margin-right: 20px; |
|||
} |
|||
.modal-body{ |
|||
height: 550px; |
|||
} |
|||
iframe{ |
|||
width: 100%; |
|||
height: 500px; |
|||
frameborder: 0; |
|||
border: 0; |
|||
display: inline-block; |
|||
} |
|||
</style> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-deliveryProgressInfo-add"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label is-required">排程编号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryProgressCode" class="form-control" type="text" required> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">计划天数：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="planDays" class="form-control" type="text" readonly> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">制作日期：</label> |
|||
<div class="col-sm-8"> |
|||
<div class="input-group date"> |
|||
<input name="produceDate" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label is-required">客户代码：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="enterpriseCode" id="enterpriseCode" class="form-control m-b" required> |
|||
<option value="">所有</option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label is-required">客户名称：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="enterpriseName" id="enterpriseName" class="form-control m-b" type="text" required readonly> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">交货厂区：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryFactory" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">开始日期：</label> |
|||
<div class="col-sm-8"> |
|||
<div class="input-group date"> |
|||
<input name="beginningDate" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">截止日期：</label> |
|||
<div class="col-sm-8"> |
|||
<div class="input-group date"> |
|||
<input name="endingDate" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">交货地点：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryAddress" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">备注内容：</label> |
|||
<div class="col-sm-8"> |
|||
<textarea name="deliveryProgressRemark" class="form-control"></textarea> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">业务人员：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="businessMembers" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<!--<div class="form-group"> |
|||
<label class="col-sm-3 control-label">确认否：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="confirmOrNot" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}"> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">确认人：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="confirmPerson" 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="confirmTime" class="form-control" type="text"> |
|||
</div> |
|||
</div>--> |
|||
</form> |
|||
</div> |
|||
|
|||
<div class="other-container"> |
|||
<div class="other"> |
|||
<br> |
|||
<hr> |
|||
<h4>选择产品信息</h4> |
|||
<a class="btn btn-primary" onclick="showProductModal()"><i class="fa fa-plus"></i> 选择产品</a> |
|||
<a class="btn btn-primary" onclick="showDateAndNumModal()"><i class="fa fa-plus"></i> 日期及数量</a> |
|||
<div class="col-sm-12 select-table table-striped"> |
|||
<table id="addProductTable" style="white-space:nowrap"></table> |
|||
</div> |
|||
</div> |
|||
<div class="modal inmodal" id="productInfoModal" |
|||
role="dilog" aria-hidden="true"> |
|||
|
|||
<!-- 查询成品资料--> |
|||
<div class="modal-dialog" style="width: 1000px;background-color: #FFFFFF"> |
|||
|
|||
<div class="modal-content" style="background-color: #FFFFFF"> |
|||
|
|||
<div class="modal-body"> |
|||
<div class="container-div"> |
|||
<div class="row"> |
|||
<div class="col-sm-12 search-collapse"> |
|||
<form id="productFormId"> |
|||
<div class="select-list"> |
|||
<ul> |
|||
<li> |
|||
<label>成品代码：</label> |
|||
<input type="text" name="finishProductCode"/> |
|||
</li> |
|||
<li> |
|||
<label>成品名称：</label> |
|||
<input type="text" name="finishProductName"/> |
|||
</li> |
|||
<li> |
|||
<label>客户代码：</label> |
|||
<input type="text" name="enterpriseCode"/> |
|||
</li> |
|||
<li> |
|||
<label>客户名称：</label> |
|||
<input type="text" name="enterpriseName"/> |
|||
</li> |
|||
<li> |
|||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('productFormId','productTable')"><i |
|||
class="fa fa-search"></i> 搜索</a> |
|||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('productFormId','productTable')"><i |
|||
class="fa fa-refresh"></i> 重置</a> |
|||
</li> |
|||
</ul> |
|||
</div> |
|||
</form> |
|||
</div> |
|||
<div class="col-sm-12 select-table table-striped"> |
|||
<table id="productTable" style="white-space:nowrap"></table> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="modal-footer"> |
|||
<a class="btn btn-warning btn-rounded" onclick="addProductToTable()">确认添加</a> |
|||
<a class="btn btn-primary btn-rounded" onclick="closeProductModal()">关闭</a> |
|||
</div> |
|||
</div> |
|||
|
|||
</div> |
|||
</div> |
|||
</div> |
|||
|
|||
<!-- <div class="modal inmodal" id="dateAndNumModal"--> |
|||
<!-- role="dilog" aria-hidden="true">--> |
|||
|
|||
<!-- <div class="modal-dialog" style="width: 1000px;background-color: #FFFFFF">--> |
|||
|
|||
<!-- <div class="modal-content" style="background-color: #FFFFFF">--> |
|||
|
|||
<!-- <div class="modal-body">--> |
|||
<!-- <div class="col-sm-12 search-collapse">--> |
|||
<!-- <form class="form-horizontal m" id="form-dateAndNum-add">--> |
|||
<!-- <label class="col-sm-3 control-label is-required">排程编号：</label>--> |
|||
<!-- <div class="col-sm-8">--> |
|||
<!-- <input name="deliveryProgressCode" class="form-control" type="text" required>--> |
|||
<!-- </div>--> |
|||
<!-- </form>--> |
|||
<!-- </div>--> |
|||
<!--<!– <div class="col-sm-12 select-table table-striped">–>--> |
|||
<!--<!– <table id="dateAndNumTable" style="white-space:nowrap"></table>–>--> |
|||
<!--<!– </div>–>--> |
|||
<!-- </div>--> |
|||
<!-- <div class="modal-footer">--> |
|||
<!-- <a class="btn btn-warning btn-rounded" onclick="addProductToTable()">确认添加</a>--> |
|||
<!-- <a class="btn btn-primary btn-rounded" onclick="closeProductModal()">关闭</a>--> |
|||
<!-- </div>--> |
|||
<!-- </div>--> |
|||
|
|||
<!-- </div>--> |
|||
<!-- </div>--> |
|||
|
|||
|
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: select2-js"/> |
|||
<th:block th:include="include :: datetimepicker-js"/> |
|||
<th:block th:include="include :: bootstrap-table-editable-js"/> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "deliveryProgress/deliveryProgressInfo" |
|||
var prefixCustomer = ctx + 'system/customer'; |
|||
var prefixfinishproduct = ctx + "system/finishproduct"; |
|||
|
|||
var inventoryUnitDatas = [[${@dict.getType('sys_unit_class')}]]; |
|||
var whetherStopDatas = [[${@dict.getType('sys_whether')}]]; |
|||
var productionCategoryDatas = [[${@dict.getType('sys_production_category')}]]; |
|||
var finishProductCategoryDatas = [[${@dict.getType('sys_finish_product_category')}]]; |
|||
var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]]; |
|||
|
|||
|
|||
var customerListData = []; |
|||
var daysListData = []; |
|||
var columnsListData = []; |
|||
|
|||
$("#form-deliveryProgressInfo-add").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/add", $('#form-deliveryProgressInfo-add').serialize()); |
|||
} |
|||
} |
|||
|
|||
$("input[name='produceDate']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true, |
|||
todayBtn: true |
|||
}); |
|||
|
|||
$("input[name='beginningDate']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true, |
|||
todayBtn: true |
|||
}); |
|||
|
|||
$("input[name='endingDate']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true, |
|||
todayBtn: true |
|||
}); |
|||
|
|||
$("input[name='produceDate']").datetimepicker('setDate',new Date()) |
|||
$("input[name='beginningDate']").datetimepicker('setDate',new Date()) |
|||
$("input[name='endingDate']").datetimepicker('setDate',new Date(getLaterDate(15,new Date()))) |
|||
//某日期之后几天的日期 |
|||
function getLaterDate(dayNum, dateTime = null) { |
|||
// 如果为null,则格式化当前时间为时间戳 |
|||
if (!dateTime) dateTime = +new Date(); |
|||
// 如果dateTime长度为10或者13，则为秒和毫秒的时间戳，如果超过13位，则为其他的时间格式 |
|||
if (dateTime.toString().length == 10) dateTime *= 1000; |
|||
const timestamp = +new Date(Number(dateTime)); |
|||
|
|||
const one_day = 86400000; // 24 * 60 * 60 * 1000; |
|||
const addVal = dayNum * one_day + timestamp; |
|||
//x天后的日期 |
|||
const date = new Date(addVal); |
|||
|
|||
//格式化日期 |
|||
const filters = n => { |
|||
return n < 10 ? (n = '0' + n) : n; |
|||
}; |
|||
const month = filters(date.getMonth() + 1); |
|||
const day = filters(date.getDate()); |
|||
const hours = filters(date.getHours()); |
|||
const minutes = filters(date.getMinutes()); |
|||
const seconds = filters(date.getSeconds()); |
|||
|
|||
const lastTime = `${date.getFullYear()}/${month}/${day} ${hours}:${minutes}:${seconds}`; |
|||
|
|||
return lastTime; |
|||
} |
|||
|
|||
$(function () { |
|||
|
|||
//初始化添加产品表 |
|||
initAddProductTable(); |
|||
|
|||
//显示产品信息 |
|||
showProductData(); |
|||
|
|||
//计划天数的显示 |
|||
getPlanDays(); |
|||
|
|||
}) |
|||
|
|||
|
|||
//客户信息 |
|||
$.ajax({ |
|||
url: prefixCustomer + '/list', |
|||
type: "post", |
|||
success: function (res) { |
|||
if (res.rows.length > 0) { |
|||
customerListData = res.rows; |
|||
for (let i in customerListData) { |
|||
$("select[name='enterpriseCode']").append("<option value='" + customerListData[i].enterpriseCode + "'>" + customerListData[i].enterpriseCode + "</option>"); |
|||
// $("select[name='enterpriseName']").append("<option value='" + customerListData[i].enterpriseName + "'>" + customerListData[i].enterpriseName + "</option>"); |
|||
} |
|||
} else { |
|||
$.modal.msgError(res.msg); |
|||
} |
|||
}, |
|||
error: function () { |
|||
$.modal.msgError("后台出错啦！"); |
|||
|
|||
} |
|||
}) |
|||
|
|||
//填入客户信息 |
|||
$("select[name='enterpriseCode']").change(function () { |
|||
var enterpriseCode = $(this).val(); |
|||
for (i = 0; i < customerListData.length; i++) { |
|||
if (customerListData[i].enterpriseCode === enterpriseCode) { |
|||
$("#enterpriseName").val(customerListData[i].enterpriseName) |
|||
$("input[name='deliveryAddress']").val(customerListData[i].deliveryAddress) |
|||
} |
|||
} |
|||
}) |
|||
var userName = [[${@permission.getPrincipalProperty('userName')}]]; |
|||
$("input[name='businessMembers']").val(userName) |
|||
|
|||
//计划天数的显示 |
|||
function getPlanDays() { |
|||
var beginningDate = $("input[name='beginningDate']").val() |
|||
var endingDate = $("input[name='endingDate']").val() |
|||
$("input[name='planDays']").val(getDaysMinus(beginningDate,endingDate)) |
|||
} |
|||
|
|||
$("input[name='beginningDate']").change(function (){ |
|||
let beginningDate = $("input[name='beginningDate']").val() |
|||
let endingDate = $("input[name='endingDate']").val() |
|||
let days = getDaysMinus(beginningDate,endingDate) |
|||
$("input[name='planDays']").val(days) |
|||
getDuringDate(); |
|||
getDateColumns(daysListData); |
|||
$("#addProductTable").bootstrapTable('refresh'); |
|||
}) |
|||
$("input[name='endingDate']").change(function (){ |
|||
let beginningDate = $("input[name='beginningDate']").val() |
|||
let endingDate = $("input[name='endingDate']").val() |
|||
let days = getDaysMinus(beginningDate,endingDate) |
|||
$("input[name='planDays']").val(days) |
|||
getDuringDate(); |
|||
getDateColumns(daysListData); |
|||
console.log(columnsListData) |
|||
$("#addProductTable").bootstrapTable('refresh'); |
|||
}) |
|||
//计算时间差的天数 |
|||
function getDaysMinus(beginningDate,endingDate) { |
|||
let time = (new Date(endingDate)).getTime() - (new Date(beginningDate)).getTime() |
|||
let days = parseInt(time/(1000 * 60 * 60 * 24)) |
|||
return days+1 |
|||
} |
|||
|
|||
//转换时间方法 |
|||
function getDate(date){ |
|||
//date是传过来的时间戳，注意需为13位，10位需*1000 |
|||
//也可以不传,获取的就是当前时间 |
|||
var time = new Date(date); |
|||
var year= time.getFullYear() //年 |
|||
var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 |
|||
var day = ("0" + time.getDate()).slice(-2); //日 |
|||
var mydate = year + "-" + month + "-" + day; |
|||
return mydate |
|||
} |
|||
|
|||
|
|||
//初始化添加产品表 |
|||
function initAddProductTable() { |
|||
getDuringDate(); |
|||
console.log(daysListData) |
|||
getDateColumns(daysListData); |
|||
console.log(columnsListData) |
|||
$('#addProductTable').bootstrapTable({ |
|||
pagination: true, |
|||
pageNumber: 1, |
|||
pageSize: 10, |
|||
showToggle: false, // 是否显示详细视图和列表视图的切换按钮 |
|||
cardView: false, // 是否显示详细视图 |
|||
detailView: false, // 是否显示父子表 |
|||
smartDisplay: false, // 加了这个才显示每页显示的行数 |
|||
showExport: false, // 是否显示导出按钮 |
|||
clickToSelect: true,//点击行选中 |
|||
paginationDetailHAlign: ' hiddenDetailInfo', |
|||
height: 250, |
|||
uniqueId: 'finishProductCode', |
|||
queryParams: function (params) { |
|||
//console.log("123"); |
|||
var curParams = { |
|||
// 传递参数查询参数 |
|||
pageSize: params.limit, |
|||
pageNum: params.offset / params.limit + 1, |
|||
// enterpriseCode: data[0].enterpriseCode |
|||
|
|||
}; |
|||
// console.log(data[0].enterpriseCode) |
|||
return curParams |
|||
}, |
|||
columns: columnsListData |
|||
}) |
|||
} |
|||
|
|||
|
|||
//获取开始-截止时间的日期list |
|||
function getDuringDate() { |
|||
var dateListData = [] |
|||
getPlanDays(); |
|||
var totalDate = $("input[name='planDays']").val() |
|||
for (var i = 0;i<totalDate;i++){ |
|||
dateListData.push(getDate(new Date(getLaterDate(i,new Date())))) |
|||
} |
|||
daysListData = [...dateListData] |
|||
} |
|||
|
|||
|
|||
//表内日期列获取 |
|||
function getDateColumns(daysListData) { |
|||
var columnsList = [] |
|||
columnsList.push({ |
|||
field: 'finishProductCode', |
|||
title: '成品代码' |
|||
}); |
|||
columnsList.push({ |
|||
field: 'finishProductName', |
|||
title: '成品名称' |
|||
}); |
|||
columnsList.push({ |
|||
field: 'specificationModel', |
|||
title: '规格型号' |
|||
}); |
|||
columnsList.push({ |
|||
field: 'typeMachine', |
|||
title: '机种' |
|||
}); |
|||
columnsList.push({ |
|||
field: 'inventoryUnit', |
|||
title: '单位', |
|||
formatter: function (value, row, index) { |
|||
return $.table.selectDictLabel(inventoryUnitDatas, value); |
|||
} |
|||
}); |
|||
for (let i = 0;i<daysListData.length;i++) { |
|||
columnsList.push({ |
|||
field: 'date', |
|||
title: daysListData[i] |
|||
// editable: { |
|||
// type: 'text', |
|||
// title: '数量', |
|||
// emptytext: '数量', |
|||
// validate: function (v) { |
|||
// if (isNaN(v)) return '数量必须是数字'; |
|||
// var ex = /^[1-9]\d*$/; |
|||
// if (!ex.test(v)) return '数量必须是正整数'; |
|||
// } |
|||
// } |
|||
}) |
|||
} |
|||
columnsListData = [...columnsList] |
|||
} |
|||
|
|||
|
|||
//显示产品信息 |
|||
function showProductData() { |
|||
var options = { |
|||
id: 'productTable', |
|||
url: prefixfinishproduct + "/list", |
|||
showRefresh: false, |
|||
showToggle: false, |
|||
clickToSelect: true, |
|||
modalName: "产品资料", |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
field: 'finishProductId', |
|||
title: '成品id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'customerNumber', |
|||
title: '客户料号' |
|||
}, |
|||
{ |
|||
field: 'typeMachine', |
|||
title: '机种' |
|||
}, |
|||
{ |
|||
field: 'finishProductName', |
|||
title: '成品名称' |
|||
}, |
|||
{ |
|||
field: 'enterpriseCode', |
|||
title: '客户代码' |
|||
}, |
|||
{ |
|||
field: 'enterpriseName', |
|||
title: '客户名称' |
|||
}, |
|||
{ |
|||
field: 'inventoryUnit', |
|||
title: '库存单位', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(inventoryUnitDatas, value); |
|||
}, |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'versionNumber', |
|||
title: '版本号' |
|||
}, |
|||
{ |
|||
field: 'finishProductCode', |
|||
title: '成品代码' |
|||
}, |
|||
{ |
|||
field: 'safetyStock', |
|||
title: '安全库存', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'stockUnitWeight', |
|||
title: '单位重量', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'gpItemSelection', |
|||
title: 'GP项选择', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(gpItemSelectionDatas, value); |
|||
}, |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'inPlantCode', |
|||
title: '厂内编码' |
|||
}, |
|||
{ |
|||
field: 'whetherStop', |
|||
title: '料号是否停用', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(whetherStopDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'createrName', |
|||
title: '创建人', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'ordinalName', |
|||
title: '半成品对应完工工序名', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'originalNumber', |
|||
title: '原成品料号', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'customsName', |
|||
title: '海关名称', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'defaultWarehouse', |
|||
title: '默认仓库' |
|||
}, |
|||
{ |
|||
field: 'materialCategory', |
|||
title: '类别', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(materialCategoryDatas, value); |
|||
}, |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'productionCategory', |
|||
title: '生产类别', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(productionCategoryDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'finishProductCategory', |
|||
title: '所属类别', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(finishProductCategoryDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'specificationModel', |
|||
title: '规格型号' |
|||
}, |
|||
{ |
|||
field: 'customerEngineer', |
|||
title: '客户工程师' |
|||
}, |
|||
{ |
|||
field: 'productDescription', |
|||
title: '产品描述', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'maximumInventory', |
|||
title: '最高库存', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'productPrice', |
|||
title: '产品售价', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'componentName', |
|||
title: '组件名称', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'createrTime', |
|||
title: '创建日期', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'ordinalNumber', |
|||
title: '半成品对应完工工序号', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'defaultLocation', |
|||
title: '默认位置', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'hsNumber', |
|||
title: 'HS号', |
|||
visible: false |
|||
|
|||
}, |
|||
{ |
|||
field: 'kesNumber', |
|||
title: '科恩仕料号' |
|||
}] |
|||
}; |
|||
$.table.init(options); |
|||
} |
|||
|
|||
/*产品内容*/ |
|||
//点击按钮显示产品信息模态框 |
|||
function showProductModal() { |
|||
if ($.validate.form()) { |
|||
$("#productInfoModal").modal("show"); |
|||
} else { |
|||
$.modal.alertWarning("请填写必填项"); |
|||
} |
|||
} |
|||
|
|||
//关闭产品信息模态框 |
|||
function closeProductModal() { |
|||
$("#productInfoModal").modal("hide"); |
|||
} |
|||
|
|||
//表中添加选中的产品信息 |
|||
function addProductToTable() { |
|||
var data = $("#productTable").bootstrapTable("getSelections"); |
|||
var count = $('#addProductTable').bootstrapTable('getData').length; |
|||
var deliveryProgressCode = $("input[name='deliveryProgressCode']").val(); |
|||
var enterpriseCode = $("input[name='enterpriseCode']").val(); |
|||
var enterpriseName = $("input[name='enterpriseName']").val(); |
|||
for (i = 0; i < data.length; i++) { |
|||
let finishProduct = $('#addProductTable').bootstrapTable('getRowByUniqueId', data[i].finishProductCode); |
|||
if (finishProduct != null) { |
|||
alert(finishProduct.finishProductName + "已存在，不可重复添加!"); |
|||
continue; |
|||
} |
|||
$("#addProductTable").bootstrapTable('insertRow', { |
|||
index: count + i, |
|||
row: { |
|||
deliveryProgressCode: deliveryProgressCode, |
|||
enterpriseCode: enterpriseCode, |
|||
enterpriseName: enterpriseName, |
|||
finishProductCode: data[i].finishProductCode, |
|||
finishProductName: data[i].finishProductName, |
|||
specificationModel: data[i].specificationModel, |
|||
typeMachine: data[i].typeMachine, |
|||
inventoryUnit: data[i].inventoryUnit |
|||
} |
|||
}); |
|||
|
|||
} |
|||
$("#productTable").bootstrapTable("uncheckAll"); |
|||
closeProductModal(); |
|||
} |
|||
|
|||
function showDateAndNumModal() { |
|||
$("#dateAndNumModal").modal("show"); |
|||
|
|||
} |
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -1,184 +0,0 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> |
|||
<head> |
|||
<th:block th:include="include :: header('交货排程列表')" /> |
|||
<th:block th:include="include :: datetimepicker-css" /> |
|||
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet"> |
|||
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet"> |
|||
<script src="https://cdn.staticfile.org/axios/1.1.3/axios.min.js"></script> |
|||
</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="deliveryProgressCode"/> |
|||
</li> |
|||
<li> |
|||
<label>客户代码：</label> |
|||
<select name="enterpriseCode"> |
|||
<option value="">所有</option> |
|||
</select> |
|||
</li> |
|||
<li> |
|||
<label>客户名称：</label> |
|||
<select name="enterpriseName"> |
|||
<option value="">所有</option> |
|||
</select> |
|||
</li> |
|||
<li> |
|||
<label>确认否：</label> |
|||
<select name="confirmOrNot" th:with="type=${@dict.getType('sys_whether')}"> |
|||
<option value="">所有</option> |
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
|||
</select> |
|||
</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="deliveryProgress:deliveryProgressInfo:add"> |
|||
<i class="fa fa-plus"></i> 添加 |
|||
</a> |
|||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="deliveryProgress:deliveryProgressInfo:edit"> |
|||
<i class="fa fa-edit"></i> 修改 |
|||
</a> |
|||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="deliveryProgress:deliveryProgressInfo:remove"> |
|||
<i class="fa fa-remove"></i> 删除 |
|||
</a> |
|||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="deliveryProgress:deliveryProgressInfo: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" /> |
|||
<th:block th:include="include :: select2-js"/> |
|||
<th:block th:include="include :: datetimepicker-js"/> |
|||
|
|||
<script th:inline="javascript"> |
|||
var editFlag = [[${@permission.hasPermi('deliveryProgress:deliveryProgressInfo:edit')}]]; |
|||
var removeFlag = [[${@permission.hasPermi('deliveryProgress:deliveryProgressInfo:remove')}]]; |
|||
var confirmOrNotDatas = [[${@dict.getType('sys_whether')}]]; |
|||
|
|||
var prefix = ctx + "deliveryProgress/deliveryProgressInfo"; |
|||
var prefixCustomer = ctx + 'system/customer'; |
|||
|
|||
var customerListData = []; |
|||
|
|||
$(function() { |
|||
var options = { |
|||
url: prefix + "/list", |
|||
createUrl: prefix + "/add", |
|||
updateUrl: prefix + "/edit/{id}", |
|||
removeUrl: prefix + "/remove", |
|||
exportUrl: prefix + "/export", |
|||
modalName: "交货排程", |
|||
columns: [{ |
|||
checkbox: true |
|||
}, |
|||
{ |
|||
field: 'deliveryProgressId', |
|||
title: '交货排程id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'deliveryProgressCode', |
|||
title: '排程编号' |
|||
}, |
|||
{ |
|||
field: 'produceDate', |
|||
title: '制作日期' |
|||
}, |
|||
{ |
|||
field: 'enterpriseCode', |
|||
title: '客户代码' |
|||
}, |
|||
{ |
|||
field: 'enterpriseName', |
|||
title: '客户名称' |
|||
}, |
|||
{ |
|||
field: 'deliveryFactory', |
|||
title: '交货厂区' |
|||
}, |
|||
{ |
|||
field: 'beginningDate', |
|||
title: '开始日期' |
|||
}, |
|||
{ |
|||
field: 'endingDate', |
|||
title: '截止日期' |
|||
}, |
|||
{ |
|||
field: 'deliveryAddress', |
|||
title: '交货地点' |
|||
}, |
|||
{ |
|||
field: 'businessMembers', |
|||
title: '业务人员' |
|||
}, |
|||
{ |
|||
field: 'confirmOrNot', |
|||
title: '确认否', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(confirmOrNotDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
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.deliveryProgressId + '\')"><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.deliveryProgressId + '\')"><i class="fa fa-remove"></i>删除</a>'); |
|||
return actions.join(''); |
|||
} |
|||
}] |
|||
}; |
|||
$.table.init(options); |
|||
|
|||
//客户信息 |
|||
getCustomerList(); |
|||
}); |
|||
|
|||
//客户信息 |
|||
function getCustomerList() { |
|||
$.ajax({ |
|||
url: prefixCustomer + '/list', |
|||
type: "post", |
|||
success: function (res) { |
|||
if (res.rows.length > 0) { |
|||
customerListData = res.rows; |
|||
for (let i in customerListData) { |
|||
$("select[name='enterpriseCode']").append("<option value='" + customerListData[i].enterpriseCode + "'>" + customerListData[i].enterpriseCode + "</option>"); |
|||
$("select[name='enterpriseName']").append("<option value='" + customerListData[i].enterpriseName + "'>" + customerListData[i].enterpriseName + "</option>"); |
|||
} |
|||
} else { |
|||
$.modal.msgError(res.msg); |
|||
} |
|||
}, |
|||
error: function () { |
|||
$.modal.msgError("后台出错啦！"); |
|||
|
|||
} |
|||
}) |
|||
} |
|||
|
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -1,147 +0,0 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('修改交货排程')" /> |
|||
<th:block th:include="include :: datetimepicker-css" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-deliveryProgressInfo-edit" th:object="${deliveryProgressInfo}"> |
|||
<input name="deliveryProgressId" th:field="*{deliveryProgressId}" type="hidden"> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label is-required">排程编号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryProgressCode" th:field="*{deliveryProgressCode}" class="form-control" type="text" required> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">计划天数：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="planDays" th:field="*{planDays}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">制作日期：</label> |
|||
<div class="col-sm-8"> |
|||
<div class="input-group date"> |
|||
<input name="produceDate" th:field="*{produceDate}" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label is-required">客户代码：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="enterpriseCode" class="form-control m-b" required> |
|||
<option value="">所有</option> |
|||
</select> |
|||
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label is-required">客户名称：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="enterpriseName" class="form-control m-b" required> |
|||
<option value="">所有</option> |
|||
</select> |
|||
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">交货厂区：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryFactory" th:field="*{deliveryFactory}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">开始日期：</label> |
|||
<div class="col-sm-8"> |
|||
<div class="input-group date"> |
|||
<input name="beginningDate" th:field="*{beginningDate}" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">截止日期：</label> |
|||
<div class="col-sm-8"> |
|||
<div class="input-group date"> |
|||
<input name="endingDate"th:field="*{endingDate}" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
|||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">交货地点：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">备注内容：</label> |
|||
<div class="col-sm-8"> |
|||
<textarea name="deliveryProgressRemark" class="form-control">[[*{deliveryProgressRemark}]]</textarea> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">业务人员：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="businessMembers" th:field="*{businessMembers}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<!-- <div class="form-group"> --> |
|||
<!-- <label class="col-sm-3 control-label">确认否：</label>--> |
|||
<!-- <div class="col-sm-8">--> |
|||
<!-- <select name="confirmOrNot" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">--> |
|||
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{confirmOrNot}"></option>--> |
|||
<!-- </select>--> |
|||
<!-- </div>--> |
|||
<!-- </div>--> |
|||
<!-- <div class="form-group"> --> |
|||
<!-- <label class="col-sm-3 control-label">确认人：</label>--> |
|||
<!-- <div class="col-sm-8">--> |
|||
<!-- <input name="confirmPerson" th:field="*{confirmPerson}" 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="confirmTime" th:field="*{confirmTime}" class="form-control" type="text">--> |
|||
<!-- </div>--> |
|||
<!-- </div>--> |
|||
</form> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: datetimepicker-js" /> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "deliveryProgress/deliveryProgressInfo"; |
|||
$("#form-deliveryProgressInfo-edit").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($.validate.form()) { |
|||
$.operate.save(prefix + "/edit", $('#form-deliveryProgressInfo-edit').serialize()); |
|||
} |
|||
} |
|||
|
|||
$("input[name='produceDate']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
$("input[name='beginningDate']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
$("input[name='endingDate']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
</script> |
|||
</body> |
|||
</html> |
|||
Loading…
Reference in new issue