@@ -5,7 +5,27 @@ | |||
</component> | |||
<component name="ChangeListManager"> | |||
<list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="mark"> | |||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByOrderInfoMapper.xml" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByWeavClothMapper.xml" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByOrderInfo.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByOrderInfoParams.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByProductInfo.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByProductInfoParams.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByWeavCloth.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByWeavClothParams.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByOrderInfoService.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByProductInfoService.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByWeavClothService.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByOrderInfoServiceImpl.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByProductInfoServiceImpl.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByWeavClothServiceImpl.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java" afterDir="false" /> | |||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java" afterDir="false" /> | |||
</list> | |||
<option name="SHOW_DIALOG" value="false" /> | |||
<option name="HIGHLIGHT_CONFLICTS" value="true" /> | |||
@@ -488,7 +508,7 @@ | |||
<workItem from="1597651088439" duration="12000" /> | |||
<workItem from="1597653578641" duration="17000" /> | |||
<workItem from="1597710573568" duration="149000" /> | |||
<workItem from="1597715559594" duration="2047000" /> | |||
<workItem from="1597715559594" duration="2738000" /> | |||
</task> | |||
<task id="LOCAL-00001" summary="mark"> | |||
<created>1597716938734</created> | |||
@@ -497,7 +517,14 @@ | |||
<option name="project" value="LOCAL" /> | |||
<updated>1597716938734</updated> | |||
</task> | |||
<option name="localTasksCounter" value="2" /> | |||
<task id="LOCAL-00002" summary="mark"> | |||
<created>1597717639939</created> | |||
<option name="number" value="00002" /> | |||
<option name="presentableId" value="LOCAL-00002" /> | |||
<option name="project" value="LOCAL" /> | |||
<updated>1597717639939</updated> | |||
</task> | |||
<option name="localTasksCounter" value="3" /> | |||
<servers /> | |||
</component> | |||
<component name="TodoView"> | |||
@@ -529,10 +556,10 @@ | |||
<screen x="0" y="0" width="1920" height="1050" /> | |||
</state> | |||
<state x="513" y="309" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597710642111" /> | |||
<state x="389" y="39" key="CommitChangelistDialog2" timestamp="1597716937923"> | |||
<state x="389" y="39" key="CommitChangelistDialog2" timestamp="1597717639469"> | |||
<screen x="0" y="0" width="1920" height="1050" /> | |||
</state> | |||
<state x="389" y="39" key="CommitChangelistDialog2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716937923" /> | |||
<state x="389" y="39" key="CommitChangelistDialog2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717639469" /> | |||
<state x="621" y="200" key="FileChooserDialogImpl" timestamp="1597653593780"> | |||
<screen x="0" y="0" width="1920" height="1050" /> | |||
</state> | |||
@@ -542,30 +569,30 @@ | |||
<screen x="0" y="0" width="1920" height="1040" /> | |||
</state> | |||
<state x="730" y="396" key="Gitee.ShareDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1597481505655" /> | |||
<state width="1921" height="28" key="GridCell.Tab.0.bottom" timestamp="1597716016595"> | |||
<state width="1921" height="28" key="GridCell.Tab.0.bottom" timestamp="1597717630394"> | |||
<screen x="0" y="0" width="1920" height="1050" /> | |||
</state> | |||
<state width="1921" height="28" key="GridCell.Tab.0.bottom/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716016595" /> | |||
<state width="1921" height="28" key="GridCell.Tab.0.center" timestamp="1597716016595"> | |||
<state width="1921" height="28" key="GridCell.Tab.0.bottom/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" /> | |||
<state width="1921" height="28" key="GridCell.Tab.0.center" timestamp="1597717630394"> | |||
<screen x="0" y="0" width="1920" height="1050" /> | |||
</state> | |||
<state width="1921" height="28" key="GridCell.Tab.0.center/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716016595" /> | |||
<state width="1921" height="28" key="GridCell.Tab.0.left" timestamp="1597716016595"> | |||
<state width="1921" height="28" key="GridCell.Tab.0.center/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" /> | |||
<state width="1921" height="28" key="GridCell.Tab.0.left" timestamp="1597717630393"> | |||
<screen x="0" y="0" width="1920" height="1050" /> | |||
</state> | |||
<state width="1921" height="28" key="GridCell.Tab.0.left/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716016595" /> | |||
<state width="1921" height="28" key="GridCell.Tab.0.right" timestamp="1597716016595"> | |||
<state width="1921" height="28" key="GridCell.Tab.0.left/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630393" /> | |||
<state width="1921" height="28" key="GridCell.Tab.0.right" timestamp="1597717630394"> | |||
<screen x="0" y="0" width="1920" height="1050" /> | |||
</state> | |||
<state width="1921" height="28" key="GridCell.Tab.0.right/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716016595" /> | |||
<state width="1921" height="28" key="GridCell.Tab.0.right/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" /> | |||
<state x="366" y="78" key="SettingsEditor" timestamp="1597481540846"> | |||
<screen x="0" y="0" width="1920" height="1040" /> | |||
</state> | |||
<state x="366" y="78" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1597481540846" /> | |||
<state x="452" y="193" key="Vcs.Push.Dialog.v2" timestamp="1597716944492"> | |||
<state x="452" y="193" key="Vcs.Push.Dialog.v2" timestamp="1597717645717"> | |||
<screen x="0" y="0" width="1920" height="1050" /> | |||
</state> | |||
<state x="452" y="193" key="Vcs.Push.Dialog.v2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716944492" /> | |||
<state x="452" y="193" key="Vcs.Push.Dialog.v2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717645717" /> | |||
</component> | |||
<component name="antWorkspaceConfiguration"> | |||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> | |||
@@ -0,0 +1,6 @@ | |||
package com.deer.wms.produce.clothflow.dao; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfo; | |||
public interface MtAloneByOrderInfoMapper extends Mapper<MtAloneByOrderInfo> { | |||
} |
@@ -0,0 +1,6 @@ | |||
package com.deer.wms.produce.clothflow.dao; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByProductInfo; | |||
public interface MtAloneByProductInfoMapper extends Mapper<MtAloneByProductInfo> { | |||
} |
@@ -0,0 +1,6 @@ | |||
package com.deer.wms.produce.clothflow.dao; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByWeavCloth; | |||
public interface MtAloneByWeavClothMapper extends Mapper<MtAloneByWeavCloth> { | |||
} |
@@ -0,0 +1,31 @@ | |||
<?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.deer.wms.produce.clothflow.dao.MtAloneByOrderInfoMapper"> | |||
<resultMap id="BaseResultMap" type="com.deer.wms.produce.clothflow.model.MtAloneByOrderInfo"> | |||
<!-- | |||
WARNING - @mbg.generated | |||
--> | |||
<result column="id" jdbcType="INTEGER" property="id" /> | |||
<result column="operator_id" jdbcType="INTEGER" property="operatorId" /> | |||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> | |||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> | |||
<result column="creator_id" jdbcType="INTEGER" property="creatorId" /> | |||
<result column="updater_id" jdbcType="INTEGER" property="updaterId" /> | |||
<result column="version" jdbcType="VARCHAR" property="version" /> | |||
<result column="order_status" jdbcType="INTEGER" property="orderStatus" /> | |||
<result column="company_id" jdbcType="INTEGER" property="companyId" /> | |||
<result column="order_name" jdbcType="VARCHAR" property="orderName" /> | |||
<result column="order_code" jdbcType="VARCHAR" property="orderCode" /> | |||
<result column="follow_id" jdbcType="INTEGER" property="followId" /> | |||
<result column="follow_name" jdbcType="VARCHAR" property="followName" /> | |||
<result column="schedule" jdbcType="INTEGER" property="schedule" /> | |||
<result column="carry_out_time" jdbcType="TIMESTAMP" property="carryOutTime" /> | |||
<result column="client_id" jdbcType="INTEGER" property="clientId" /> | |||
<result column="client_code" jdbcType="VARCHAR" property="clientCode" /> | |||
<result column="client_name" jdbcType="VARCHAR" property="clientName" /> | |||
<result column="client_tel" jdbcType="VARCHAR" property="clientTel" /> | |||
<result column="ship_time" jdbcType="TIMESTAMP" property="shipTime" /> | |||
<result column="description" jdbcType="VARCHAR" property="description" /> | |||
<result column="note" jdbcType="VARCHAR" property="note" /> | |||
</resultMap> | |||
</mapper> |
@@ -0,0 +1,37 @@ | |||
<?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.deer.wms.produce.clothflow.dao.MtAloneByProductInfoMapper"> | |||
<resultMap id="BaseResultMap" type="com.deer.wms.produce.clothflow.model.MtAloneByProductInfo"> | |||
<!-- | |||
WARNING - @mbg.generated | |||
--> | |||
<result column="id" jdbcType="INTEGER" property="id" /> | |||
<result column="operator_id" jdbcType="INTEGER" property="operatorId" /> | |||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> | |||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> | |||
<result column="creator_id" jdbcType="INTEGER" property="creatorId" /> | |||
<result column="updater_id" jdbcType="INTEGER" property="updaterId" /> | |||
<result column="version" jdbcType="VARCHAR" property="version" /> | |||
<result column="product_status" jdbcType="INTEGER" property="productStatus" /> | |||
<result column="company_id" jdbcType="INTEGER" property="companyId" /> | |||
<result column="order_info_id" jdbcType="INTEGER" property="orderInfoId" /> | |||
<result column="product_id" jdbcType="INTEGER" property="productId" /> | |||
<result column="product_code" jdbcType="VARCHAR" property="productCode" /> | |||
<result column="product_name" jdbcType="VARCHAR" property="productName" /> | |||
<result column="spec" jdbcType="VARCHAR" property="spec" /> | |||
<result column="gram_weight" jdbcType="VARCHAR" property="gramWeight" /> | |||
<result column="product_length" jdbcType="REAL" property="productLength" /> | |||
<result column="processing_mode" jdbcType="VARCHAR" property="processingMode" /> | |||
<result column="description" jdbcType="VARCHAR" property="description" /> | |||
<result column="note" jdbcType="VARCHAR" property="note" /> | |||
<result column="goods_in_stock_isok" jdbcType="INTEGER" property="goodsInStockIsok" /> | |||
<result column="weav_cloth_isok" jdbcType="INTEGER" property="weavClothIsok" /> | |||
<result column="run_cloth_isok" jdbcType="INTEGER" property="runClothIsok" /> | |||
<result column="go_dye_factory_isok" jdbcType="INTEGER" property="goDyeFactoryIsok" /> | |||
<result column="coating_isok" jdbcType="INTEGER" property="coatingIsok" /> | |||
<result column="trimming" jdbcType="INTEGER" property="trimming" /> | |||
<result column="pack" jdbcType="INTEGER" property="pack" /> | |||
<result column="deliver_goods" jdbcType="INTEGER" property="deliverGoods" /> | |||
<result column="complete" jdbcType="INTEGER" property="complete" /> | |||
</resultMap> | |||
</mapper> |
@@ -0,0 +1,31 @@ | |||
<?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.deer.wms.produce.clothflow.dao.MtAloneByWeavClothMapper"> | |||
<resultMap id="BaseResultMap" type="com.deer.wms.produce.clothflow.model.MtAloneByWeavCloth"> | |||
<!-- | |||
WARNING - @mbg.generated | |||
--> | |||
<result column="id" jdbcType="INTEGER" property="id" /> | |||
<result column="operator_id" jdbcType="INTEGER" property="operatorId" /> | |||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> | |||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> | |||
<result column="creator_id" jdbcType="INTEGER" property="creatorId" /> | |||
<result column="updater_id" jdbcType="INTEGER" property="updaterId" /> | |||
<result column="version" jdbcType="VARCHAR" property="version" /> | |||
<result column="weav_cloth_status" jdbcType="INTEGER" property="weavClothStatus" /> | |||
<result column="company_id" jdbcType="INTEGER" property="companyId" /> | |||
<result column="product_id" jdbcType="INTEGER" property="productId" /> | |||
<result column="is_stock" jdbcType="INTEGER" property="isStock" /> | |||
<result column="weav_cloth_length" jdbcType="REAL" property="weavClothLength" /> | |||
<result column="curr_progress" jdbcType="VARCHAR" property="currProgress" /> | |||
<result column="supplier_id" jdbcType="INTEGER" property="supplierId" /> | |||
<result column="supplier_code" jdbcType="VARCHAR" property="supplierCode" /> | |||
<result column="plan_length" jdbcType="REAL" property="planLength" /> | |||
<result column="actual_length" jdbcType="REAL" property="actualLength" /> | |||
<result column="shrinkage" jdbcType="VARCHAR" property="shrinkage" /> | |||
<result column="cost" jdbcType="REAL" property="cost" /> | |||
<result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" /> | |||
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" /> | |||
<result column="note" jdbcType="VARCHAR" property="note" /> | |||
</resultMap> | |||
</mapper> |
@@ -0,0 +1,524 @@ | |||
package com.deer.wms.produce.clothflow.model; | |||
import java.util.Date; | |||
import javax.persistence.*; | |||
@Table(name = "mt_alone_by_order_info") | |||
public class MtAloneByOrderInfo { | |||
@GeneratedValue(strategy = GenerationType.IDENTITY) | |||
private Integer id; | |||
/** | |||
* 操作员id | |||
*/ | |||
@Column(name = "operator_id") | |||
private Integer operatorId; | |||
/** | |||
* 添加时间 | |||
*/ | |||
@Column(name = "create_time") | |||
private Date createTime; | |||
/** | |||
* 修改时间 | |||
*/ | |||
@Column(name = "update_time") | |||
private Date updateTime; | |||
/** | |||
* 创建人id | |||
*/ | |||
@Column(name = "creator_id") | |||
private Integer creatorId; | |||
/** | |||
* 更新人id | |||
*/ | |||
@Column(name = "updater_id") | |||
private Integer updaterId; | |||
/** | |||
* 版本号 默认为 1 | |||
*/ | |||
private String version; | |||
/** | |||
* 状态 0:执行中,1:逻辑删除,2:完成 | |||
*/ | |||
@Column(name = "order_status") | |||
private Integer orderStatus; | |||
/** | |||
* 绑定公司id | |||
*/ | |||
@Column(name = "company_id") | |||
private Integer companyId; | |||
/** | |||
* 订单名称 | |||
*/ | |||
@Column(name = "order_name") | |||
private String orderName; | |||
/** | |||
* 订单编码 | |||
*/ | |||
@Column(name = "order_code") | |||
private String orderCode; | |||
/** | |||
* 跟单员id | |||
*/ | |||
@Column(name = "follow_id") | |||
private Integer followId; | |||
/** | |||
* 跟单员名称,管理业务员 | |||
*/ | |||
@Column(name = "follow_name") | |||
private String followName; | |||
/** | |||
* 当前进度,0完成,1现货;2织布;3跑布;4染厂;5涂层;6裁切;7打包;8发货; | |||
*/ | |||
private Integer schedule; | |||
/** | |||
* 完成时间 | |||
*/ | |||
@Column(name = "carry_out_time") | |||
private Date carryOutTime; | |||
/** | |||
* 客户id,关联客户表,弹出对话框选择客户 | |||
*/ | |||
@Column(name = "client_id") | |||
private Integer clientId; | |||
/** | |||
* 客户编码 | |||
*/ | |||
@Column(name = "client_code") | |||
private String clientCode; | |||
/** | |||
* 客户名称 | |||
*/ | |||
@Column(name = "client_name") | |||
private String clientName; | |||
/** | |||
* 联系电话 | |||
*/ | |||
@Column(name = "client_tel") | |||
private String clientTel; | |||
/** | |||
* 期望发货时间 | |||
*/ | |||
@Column(name = "ship_time") | |||
private Date shipTime; | |||
/** | |||
* 描述信息 | |||
*/ | |||
private String description; | |||
/** | |||
* 备注 | |||
*/ | |||
private String note; | |||
/** | |||
* @return id | |||
*/ | |||
public Integer getId() { | |||
return id; | |||
} | |||
/** | |||
* @param id | |||
*/ | |||
public void setId(Integer id) { | |||
this.id = id; | |||
} | |||
/** | |||
* 获取操作员id | |||
* | |||
* @return operator_id - 操作员id | |||
*/ | |||
public Integer getOperatorId() { | |||
return operatorId; | |||
} | |||
/** | |||
* 设置操作员id | |||
* | |||
* @param operatorId 操作员id | |||
*/ | |||
public void setOperatorId(Integer operatorId) { | |||
this.operatorId = operatorId; | |||
} | |||
/** | |||
* 获取添加时间 | |||
* | |||
* @return create_time - 添加时间 | |||
*/ | |||
public Date getCreateTime() { | |||
return createTime; | |||
} | |||
/** | |||
* 设置添加时间 | |||
* | |||
* @param createTime 添加时间 | |||
*/ | |||
public void setCreateTime(Date createTime) { | |||
this.createTime = createTime; | |||
} | |||
/** | |||
* 获取修改时间 | |||
* | |||
* @return update_time - 修改时间 | |||
*/ | |||
public Date getUpdateTime() { | |||
return updateTime; | |||
} | |||
/** | |||
* 设置修改时间 | |||
* | |||
* @param updateTime 修改时间 | |||
*/ | |||
public void setUpdateTime(Date updateTime) { | |||
this.updateTime = updateTime; | |||
} | |||
/** | |||
* 获取创建人id | |||
* | |||
* @return creator_id - 创建人id | |||
*/ | |||
public Integer getCreatorId() { | |||
return creatorId; | |||
} | |||
/** | |||
* 设置创建人id | |||
* | |||
* @param creatorId 创建人id | |||
*/ | |||
public void setCreatorId(Integer creatorId) { | |||
this.creatorId = creatorId; | |||
} | |||
/** | |||
* 获取更新人id | |||
* | |||
* @return updater_id - 更新人id | |||
*/ | |||
public Integer getUpdaterId() { | |||
return updaterId; | |||
} | |||
/** | |||
* 设置更新人id | |||
* | |||
* @param updaterId 更新人id | |||
*/ | |||
public void setUpdaterId(Integer updaterId) { | |||
this.updaterId = updaterId; | |||
} | |||
/** | |||
* 获取版本号 默认为 1 | |||
* | |||
* @return version - 版本号 默认为 1 | |||
*/ | |||
public String getVersion() { | |||
return version; | |||
} | |||
/** | |||
* 设置版本号 默认为 1 | |||
* | |||
* @param version 版本号 默认为 1 | |||
*/ | |||
public void setVersion(String version) { | |||
this.version = version; | |||
} | |||
/** | |||
* 获取状态 0:执行中,1:逻辑删除,2:完成 | |||
* | |||
* @return order_status - 状态 0:执行中,1:逻辑删除,2:完成 | |||
*/ | |||
public Integer getOrderStatus() { | |||
return orderStatus; | |||
} | |||
/** | |||
* 设置状态 0:执行中,1:逻辑删除,2:完成 | |||
* | |||
* @param orderStatus 状态 0:执行中,1:逻辑删除,2:完成 | |||
*/ | |||
public void setOrderStatus(Integer orderStatus) { | |||
this.orderStatus = orderStatus; | |||
} | |||
/** | |||
* 获取绑定公司id | |||
* | |||
* @return company_id - 绑定公司id | |||
*/ | |||
public Integer getCompanyId() { | |||
return companyId; | |||
} | |||
/** | |||
* 设置绑定公司id | |||
* | |||
* @param companyId 绑定公司id | |||
*/ | |||
public void setCompanyId(Integer companyId) { | |||
this.companyId = companyId; | |||
} | |||
/** | |||
* 获取订单名称 | |||
* | |||
* @return order_name - 订单名称 | |||
*/ | |||
public String getOrderName() { | |||
return orderName; | |||
} | |||
/** | |||
* 设置订单名称 | |||
* | |||
* @param orderName 订单名称 | |||
*/ | |||
public void setOrderName(String orderName) { | |||
this.orderName = orderName; | |||
} | |||
/** | |||
* 获取订单编码 | |||
* | |||
* @return order_code - 订单编码 | |||
*/ | |||
public String getOrderCode() { | |||
return orderCode; | |||
} | |||
/** | |||
* 设置订单编码 | |||
* | |||
* @param orderCode 订单编码 | |||
*/ | |||
public void setOrderCode(String orderCode) { | |||
this.orderCode = orderCode; | |||
} | |||
/** | |||
* 获取跟单员id | |||
* | |||
* @return follow_id - 跟单员id | |||
*/ | |||
public Integer getFollowId() { | |||
return followId; | |||
} | |||
/** | |||
* 设置跟单员id | |||
* | |||
* @param followId 跟单员id | |||
*/ | |||
public void setFollowId(Integer followId) { | |||
this.followId = followId; | |||
} | |||
/** | |||
* 获取跟单员名称,管理业务员 | |||
* | |||
* @return follow_name - 跟单员名称,管理业务员 | |||
*/ | |||
public String getFollowName() { | |||
return followName; | |||
} | |||
/** | |||
* 设置跟单员名称,管理业务员 | |||
* | |||
* @param followName 跟单员名称,管理业务员 | |||
*/ | |||
public void setFollowName(String followName) { | |||
this.followName = followName; | |||
} | |||
/** | |||
* 获取当前进度,0完成,1现货;2织布;3跑布;4染厂;5涂层;6裁切;7打包;8发货; | |||
* | |||
* @return schedule - 当前进度,0完成,1现货;2织布;3跑布;4染厂;5涂层;6裁切;7打包;8发货; | |||
*/ | |||
public Integer getSchedule() { | |||
return schedule; | |||
} | |||
/** | |||
* 设置当前进度,0完成,1现货;2织布;3跑布;4染厂;5涂层;6裁切;7打包;8发货; | |||
* | |||
* @param schedule 当前进度,0完成,1现货;2织布;3跑布;4染厂;5涂层;6裁切;7打包;8发货; | |||
*/ | |||
public void setSchedule(Integer schedule) { | |||
this.schedule = schedule; | |||
} | |||
/** | |||
* 获取完成时间 | |||
* | |||
* @return carry_out_time - 完成时间 | |||
*/ | |||
public Date getCarryOutTime() { | |||
return carryOutTime; | |||
} | |||
/** | |||
* 设置完成时间 | |||
* | |||
* @param carryOutTime 完成时间 | |||
*/ | |||
public void setCarryOutTime(Date carryOutTime) { | |||
this.carryOutTime = carryOutTime; | |||
} | |||
/** | |||
* 获取客户id,关联客户表,弹出对话框选择客户 | |||
* | |||
* @return client_id - 客户id,关联客户表,弹出对话框选择客户 | |||
*/ | |||
public Integer getClientId() { | |||
return clientId; | |||
} | |||
/** | |||
* 设置客户id,关联客户表,弹出对话框选择客户 | |||
* | |||
* @param clientId 客户id,关联客户表,弹出对话框选择客户 | |||
*/ | |||
public void setClientId(Integer clientId) { | |||
this.clientId = clientId; | |||
} | |||
/** | |||
* 获取客户编码 | |||
* | |||
* @return client_code - 客户编码 | |||
*/ | |||
public String getClientCode() { | |||
return clientCode; | |||
} | |||
/** | |||
* 设置客户编码 | |||
* | |||
* @param clientCode 客户编码 | |||
*/ | |||
public void setClientCode(String clientCode) { | |||
this.clientCode = clientCode; | |||
} | |||
/** | |||
* 获取客户名称 | |||
* | |||
* @return client_name - 客户名称 | |||
*/ | |||
public String getClientName() { | |||
return clientName; | |||
} | |||
/** | |||
* 设置客户名称 | |||
* | |||
* @param clientName 客户名称 | |||
*/ | |||
public void setClientName(String clientName) { | |||
this.clientName = clientName; | |||
} | |||
/** | |||
* 获取联系电话 | |||
* | |||
* @return client_tel - 联系电话 | |||
*/ | |||
public String getClientTel() { | |||
return clientTel; | |||
} | |||
/** | |||
* 设置联系电话 | |||
* | |||
* @param clientTel 联系电话 | |||
*/ | |||
public void setClientTel(String clientTel) { | |||
this.clientTel = clientTel; | |||
} | |||
/** | |||
* 获取期望发货时间 | |||
* | |||
* @return ship_time - 期望发货时间 | |||
*/ | |||
public Date getShipTime() { | |||
return shipTime; | |||
} | |||
/** | |||
* 设置期望发货时间 | |||
* | |||
* @param shipTime 期望发货时间 | |||
*/ | |||
public void setShipTime(Date shipTime) { | |||
this.shipTime = shipTime; | |||
} | |||
/** | |||
* 获取描述信息 | |||
* | |||
* @return description - 描述信息 | |||
*/ | |||
public String getDescription() { | |||
return description; | |||
} | |||
/** | |||
* 设置描述信息 | |||
* | |||
* @param description 描述信息 | |||
*/ | |||
public void setDescription(String description) { | |||
this.description = description; | |||
} | |||
/** | |||
* 获取备注 | |||
* | |||
* @return note - 备注 | |||
*/ | |||
public String getNote() { | |||
return note; | |||
} | |||
/** | |||
* 设置备注 | |||
* | |||
* @param note 备注 | |||
*/ | |||
public void setNote(String note) { | |||
this.note = note; | |||
} | |||
} |
@@ -0,0 +1,9 @@ | |||
package com.deer.wms.produce.clothflow.model; | |||
import com.deer.wms.project.seed.core.service.QueryParams; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
public class MtAloneByOrderInfoParams extends QueryParams { | |||
} |
@@ -0,0 +1,665 @@ | |||
package com.deer.wms.produce.clothflow.model; | |||
import java.util.Date; | |||
import javax.persistence.*; | |||
@Table(name = "mt_alone_by_product_info") | |||
public class MtAloneByProductInfo { | |||
@GeneratedValue(strategy = GenerationType.IDENTITY) | |||
private Integer id; | |||
/** | |||
* 操作员id | |||
*/ | |||
@Column(name = "operator_id") | |||
private Integer operatorId; | |||
/** | |||
* 添加时间 | |||
*/ | |||
@Column(name = "create_time") | |||
private Date createTime; | |||
/** | |||
* 修改时间 | |||
*/ | |||
@Column(name = "update_time") | |||
private Date updateTime; | |||
/** | |||
* 创建人id | |||
*/ | |||
@Column(name = "creator_id") | |||
private Integer creatorId; | |||
/** | |||
* 更新人id | |||
*/ | |||
@Column(name = "updater_id") | |||
private Integer updaterId; | |||
/** | |||
* 版本号 默认为 1 | |||
*/ | |||
private String version; | |||
/** | |||
* 状态 0处理中,1处理完成,2逻辑删除 | |||
*/ | |||
@Column(name = "product_status") | |||
private Integer productStatus; | |||
/** | |||
* 绑定公司id | |||
*/ | |||
@Column(name = "company_id") | |||
private Integer companyId; | |||
/** | |||
* 订单id,关联订单信息表:mt_alone_by_order_info | |||
*/ | |||
@Column(name = "order_info_id") | |||
private Integer orderInfoId; | |||
/** | |||
* 产品id,关联产品池表:mt_alone_product_library | |||
*/ | |||
@Column(name = "product_id") | |||
private Integer productId; | |||
/** | |||
* 品号 | |||
*/ | |||
@Column(name = "product_code") | |||
private String productCode; | |||
/** | |||
* 中文品名,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
@Column(name = "product_name") | |||
private String productName; | |||
/** | |||
* 规格,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
private String spec; | |||
/** | |||
* 克重g/m2,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
@Column(name = "gram_weight") | |||
private String gramWeight; | |||
/** | |||
* 长度 | |||
*/ | |||
@Column(name = "product_length") | |||
private Float productLength; | |||
/** | |||
* 加工方式,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
@Column(name = "processing_mode") | |||
private String processingMode; | |||
/** | |||
* 描述信息 | |||
*/ | |||
private String description; | |||
/** | |||
* 备注 | |||
*/ | |||
private String note; | |||
/** | |||
* 现货 是否 全部ok 1 true,2 false | |||
*/ | |||
@Column(name = "goods_in_stock_isok") | |||
private Integer goodsInStockIsok; | |||
/** | |||
* 织布 是否 全部ok 1 true,2 false | |||
*/ | |||
@Column(name = "weav_cloth_isok") | |||
private Integer weavClothIsok; | |||
/** | |||
* 跑布 是否 全部ok 1 true,2 false | |||
*/ | |||
@Column(name = "run_cloth_isok") | |||
private Integer runClothIsok; | |||
/** | |||
* 去染厂 是否 全部ok 1 true,2 false | |||
*/ | |||
@Column(name = "go_dye_factory_isok") | |||
private Integer goDyeFactoryIsok; | |||
/** | |||
* 涂层 是否 全部ok 1 true,2 false | |||
*/ | |||
@Column(name = "coating_isok") | |||
private Integer coatingIsok; | |||
/** | |||
* 切边裁剪 是否 全部ok 1 true,2 false | |||
*/ | |||
private Integer trimming; | |||
/** | |||
* 打包 是否 全部ok 1 true,2 false | |||
*/ | |||
private Integer pack; | |||
/** | |||
* 发货 是否 全部ok 1 true,2 false | |||
*/ | |||
@Column(name = "deliver_goods") | |||
private Integer deliverGoods; | |||
/** | |||
* 完成 是否 全部ok 1 true,2 false | |||
*/ | |||
private Integer complete; | |||
/** | |||
* @return id | |||
*/ | |||
public Integer getId() { | |||
return id; | |||
} | |||
/** | |||
* @param id | |||
*/ | |||
public void setId(Integer id) { | |||
this.id = id; | |||
} | |||
/** | |||
* 获取操作员id | |||
* | |||
* @return operator_id - 操作员id | |||
*/ | |||
public Integer getOperatorId() { | |||
return operatorId; | |||
} | |||
/** | |||
* 设置操作员id | |||
* | |||
* @param operatorId 操作员id | |||
*/ | |||
public void setOperatorId(Integer operatorId) { | |||
this.operatorId = operatorId; | |||
} | |||
/** | |||
* 获取添加时间 | |||
* | |||
* @return create_time - 添加时间 | |||
*/ | |||
public Date getCreateTime() { | |||
return createTime; | |||
} | |||
/** | |||
* 设置添加时间 | |||
* | |||
* @param createTime 添加时间 | |||
*/ | |||
public void setCreateTime(Date createTime) { | |||
this.createTime = createTime; | |||
} | |||
/** | |||
* 获取修改时间 | |||
* | |||
* @return update_time - 修改时间 | |||
*/ | |||
public Date getUpdateTime() { | |||
return updateTime; | |||
} | |||
/** | |||
* 设置修改时间 | |||
* | |||
* @param updateTime 修改时间 | |||
*/ | |||
public void setUpdateTime(Date updateTime) { | |||
this.updateTime = updateTime; | |||
} | |||
/** | |||
* 获取创建人id | |||
* | |||
* @return creator_id - 创建人id | |||
*/ | |||
public Integer getCreatorId() { | |||
return creatorId; | |||
} | |||
/** | |||
* 设置创建人id | |||
* | |||
* @param creatorId 创建人id | |||
*/ | |||
public void setCreatorId(Integer creatorId) { | |||
this.creatorId = creatorId; | |||
} | |||
/** | |||
* 获取更新人id | |||
* | |||
* @return updater_id - 更新人id | |||
*/ | |||
public Integer getUpdaterId() { | |||
return updaterId; | |||
} | |||
/** | |||
* 设置更新人id | |||
* | |||
* @param updaterId 更新人id | |||
*/ | |||
public void setUpdaterId(Integer updaterId) { | |||
this.updaterId = updaterId; | |||
} | |||
/** | |||
* 获取版本号 默认为 1 | |||
* | |||
* @return version - 版本号 默认为 1 | |||
*/ | |||
public String getVersion() { | |||
return version; | |||
} | |||
/** | |||
* 设置版本号 默认为 1 | |||
* | |||
* @param version 版本号 默认为 1 | |||
*/ | |||
public void setVersion(String version) { | |||
this.version = version; | |||
} | |||
/** | |||
* 获取状态 0处理中,1处理完成,2逻辑删除 | |||
* | |||
* @return product_status - 状态 0处理中,1处理完成,2逻辑删除 | |||
*/ | |||
public Integer getProductStatus() { | |||
return productStatus; | |||
} | |||
/** | |||
* 设置状态 0处理中,1处理完成,2逻辑删除 | |||
* | |||
* @param productStatus 状态 0处理中,1处理完成,2逻辑删除 | |||
*/ | |||
public void setProductStatus(Integer productStatus) { | |||
this.productStatus = productStatus; | |||
} | |||
/** | |||
* 获取绑定公司id | |||
* | |||
* @return company_id - 绑定公司id | |||
*/ | |||
public Integer getCompanyId() { | |||
return companyId; | |||
} | |||
/** | |||
* 设置绑定公司id | |||
* | |||
* @param companyId 绑定公司id | |||
*/ | |||
public void setCompanyId(Integer companyId) { | |||
this.companyId = companyId; | |||
} | |||
/** | |||
* 获取订单id,关联订单信息表:mt_alone_by_order_info | |||
* | |||
* @return order_info_id - 订单id,关联订单信息表:mt_alone_by_order_info | |||
*/ | |||
public Integer getOrderInfoId() { | |||
return orderInfoId; | |||
} | |||
/** | |||
* 设置订单id,关联订单信息表:mt_alone_by_order_info | |||
* | |||
* @param orderInfoId 订单id,关联订单信息表:mt_alone_by_order_info | |||
*/ | |||
public void setOrderInfoId(Integer orderInfoId) { | |||
this.orderInfoId = orderInfoId; | |||
} | |||
/** | |||
* 获取产品id,关联产品池表:mt_alone_product_library | |||
* | |||
* @return product_id - 产品id,关联产品池表:mt_alone_product_library | |||
*/ | |||
public Integer getProductId() { | |||
return productId; | |||
} | |||
/** | |||
* 设置产品id,关联产品池表:mt_alone_product_library | |||
* | |||
* @param productId 产品id,关联产品池表:mt_alone_product_library | |||
*/ | |||
public void setProductId(Integer productId) { | |||
this.productId = productId; | |||
} | |||
/** | |||
* 获取品号 | |||
* | |||
* @return product_code - 品号 | |||
*/ | |||
public String getProductCode() { | |||
return productCode; | |||
} | |||
/** | |||
* 设置品号 | |||
* | |||
* @param productCode 品号 | |||
*/ | |||
public void setProductCode(String productCode) { | |||
this.productCode = productCode; | |||
} | |||
/** | |||
* 获取中文品名,从产品池获取,弹出对话框查询获取 | |||
* | |||
* @return product_name - 中文品名,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
public String getProductName() { | |||
return productName; | |||
} | |||
/** | |||
* 设置中文品名,从产品池获取,弹出对话框查询获取 | |||
* | |||
* @param productName 中文品名,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
public void setProductName(String productName) { | |||
this.productName = productName; | |||
} | |||
/** | |||
* 获取规格,从产品池获取,弹出对话框查询获取 | |||
* | |||
* @return spec - 规格,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
public String getSpec() { | |||
return spec; | |||
} | |||
/** | |||
* 设置规格,从产品池获取,弹出对话框查询获取 | |||
* | |||
* @param spec 规格,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
public void setSpec(String spec) { | |||
this.spec = spec; | |||
} | |||
/** | |||
* 获取克重g/m2,从产品池获取,弹出对话框查询获取 | |||
* | |||
* @return gram_weight - 克重g/m2,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
public String getGramWeight() { | |||
return gramWeight; | |||
} | |||
/** | |||
* 设置克重g/m2,从产品池获取,弹出对话框查询获取 | |||
* | |||
* @param gramWeight 克重g/m2,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
public void setGramWeight(String gramWeight) { | |||
this.gramWeight = gramWeight; | |||
} | |||
/** | |||
* 获取长度 | |||
* | |||
* @return product_length - 长度 | |||
*/ | |||
public Float getProductLength() { | |||
return productLength; | |||
} | |||
/** | |||
* 设置长度 | |||
* | |||
* @param productLength 长度 | |||
*/ | |||
public void setProductLength(Float productLength) { | |||
this.productLength = productLength; | |||
} | |||
/** | |||
* 获取加工方式,从产品池获取,弹出对话框查询获取 | |||
* | |||
* @return processing_mode - 加工方式,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
public String getProcessingMode() { | |||
return processingMode; | |||
} | |||
/** | |||
* 设置加工方式,从产品池获取,弹出对话框查询获取 | |||
* | |||
* @param processingMode 加工方式,从产品池获取,弹出对话框查询获取 | |||
*/ | |||
public void setProcessingMode(String processingMode) { | |||
this.processingMode = processingMode; | |||
} | |||
/** | |||
* 获取描述信息 | |||
* | |||
* @return description - 描述信息 | |||
*/ | |||
public String getDescription() { | |||
return description; | |||
} | |||
/** | |||
* 设置描述信息 | |||
* | |||
* @param description 描述信息 | |||
*/ | |||
public void setDescription(String description) { | |||
this.description = description; | |||
} | |||
/** | |||
* 获取备注 | |||
* | |||
* @return note - 备注 | |||
*/ | |||
public String getNote() { | |||
return note; | |||
} | |||
/** | |||
* 设置备注 | |||
* | |||
* @param note 备注 | |||
*/ | |||
public void setNote(String note) { | |||
this.note = note; | |||
} | |||
/** | |||
* 获取现货 是否 全部ok 1 true,2 false | |||
* | |||
* @return goods_in_stock_isok - 现货 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getGoodsInStockIsok() { | |||
return goodsInStockIsok; | |||
} | |||
/** | |||
* 设置现货 是否 全部ok 1 true,2 false | |||
* | |||
* @param goodsInStockIsok 现货 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setGoodsInStockIsok(Integer goodsInStockIsok) { | |||
this.goodsInStockIsok = goodsInStockIsok; | |||
} | |||
/** | |||
* 获取织布 是否 全部ok 1 true,2 false | |||
* | |||
* @return weav_cloth_isok - 织布 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getWeavClothIsok() { | |||
return weavClothIsok; | |||
} | |||
/** | |||
* 设置织布 是否 全部ok 1 true,2 false | |||
* | |||
* @param weavClothIsok 织布 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setWeavClothIsok(Integer weavClothIsok) { | |||
this.weavClothIsok = weavClothIsok; | |||
} | |||
/** | |||
* 获取跑布 是否 全部ok 1 true,2 false | |||
* | |||
* @return run_cloth_isok - 跑布 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getRunClothIsok() { | |||
return runClothIsok; | |||
} | |||
/** | |||
* 设置跑布 是否 全部ok 1 true,2 false | |||
* | |||
* @param runClothIsok 跑布 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setRunClothIsok(Integer runClothIsok) { | |||
this.runClothIsok = runClothIsok; | |||
} | |||
/** | |||
* 获取去染厂 是否 全部ok 1 true,2 false | |||
* | |||
* @return go_dye_factory_isok - 去染厂 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getGoDyeFactoryIsok() { | |||
return goDyeFactoryIsok; | |||
} | |||
/** | |||
* 设置去染厂 是否 全部ok 1 true,2 false | |||
* | |||
* @param goDyeFactoryIsok 去染厂 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setGoDyeFactoryIsok(Integer goDyeFactoryIsok) { | |||
this.goDyeFactoryIsok = goDyeFactoryIsok; | |||
} | |||
/** | |||
* 获取涂层 是否 全部ok 1 true,2 false | |||
* | |||
* @return coating_isok - 涂层 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getCoatingIsok() { | |||
return coatingIsok; | |||
} | |||
/** | |||
* 设置涂层 是否 全部ok 1 true,2 false | |||
* | |||
* @param coatingIsok 涂层 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setCoatingIsok(Integer coatingIsok) { | |||
this.coatingIsok = coatingIsok; | |||
} | |||
/** | |||
* 获取切边裁剪 是否 全部ok 1 true,2 false | |||
* | |||
* @return trimming - 切边裁剪 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getTrimming() { | |||
return trimming; | |||
} | |||
/** | |||
* 设置切边裁剪 是否 全部ok 1 true,2 false | |||
* | |||
* @param trimming 切边裁剪 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setTrimming(Integer trimming) { | |||
this.trimming = trimming; | |||
} | |||
/** | |||
* 获取打包 是否 全部ok 1 true,2 false | |||
* | |||
* @return pack - 打包 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getPack() { | |||
return pack; | |||
} | |||
/** | |||
* 设置打包 是否 全部ok 1 true,2 false | |||
* | |||
* @param pack 打包 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setPack(Integer pack) { | |||
this.pack = pack; | |||
} | |||
/** | |||
* 获取发货 是否 全部ok 1 true,2 false | |||
* | |||
* @return deliver_goods - 发货 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getDeliverGoods() { | |||
return deliverGoods; | |||
} | |||
/** | |||
* 设置发货 是否 全部ok 1 true,2 false | |||
* | |||
* @param deliverGoods 发货 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setDeliverGoods(Integer deliverGoods) { | |||
this.deliverGoods = deliverGoods; | |||
} | |||
/** | |||
* 获取完成 是否 全部ok 1 true,2 false | |||
* | |||
* @return complete - 完成 是否 全部ok 1 true,2 false | |||
*/ | |||
public Integer getComplete() { | |||
return complete; | |||
} | |||
/** | |||
* 设置完成 是否 全部ok 1 true,2 false | |||
* | |||
* @param complete 完成 是否 全部ok 1 true,2 false | |||
*/ | |||
public void setComplete(Integer complete) { | |||
this.complete = complete; | |||
} | |||
} |
@@ -0,0 +1,9 @@ | |||
package com.deer.wms.produce.clothflow.model; | |||
import com.deer.wms.project.seed.core.service.QueryParams; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
public class MtAloneByProductInfoParams extends QueryParams { | |||
} |
@@ -0,0 +1,524 @@ | |||
package com.deer.wms.produce.clothflow.model; | |||
import java.util.Date; | |||
import javax.persistence.*; | |||
@Table(name = "mt_alone_by_weav_cloth") | |||
public class MtAloneByWeavCloth { | |||
@GeneratedValue(strategy = GenerationType.IDENTITY) | |||
private Integer id; | |||
/** | |||
* 操作员id | |||
*/ | |||
@Column(name = "operator_id") | |||
private Integer operatorId; | |||
/** | |||
* 添加时间 | |||
*/ | |||
@Column(name = "create_time") | |||
private Date createTime; | |||
/** | |||
* 修改时间 | |||
*/ | |||
@Column(name = "update_time") | |||
private Date updateTime; | |||
/** | |||
* 创建人id | |||
*/ | |||
@Column(name = "creator_id") | |||
private Integer creatorId; | |||
/** | |||
* 更新人id | |||
*/ | |||
@Column(name = "updater_id") | |||
private Integer updaterId; | |||
/** | |||
* 版本号 默认为 1 | |||
*/ | |||
private String version; | |||
/** | |||
* 状态 0处理中,1处理完成,2逻辑删除 | |||
*/ | |||
@Column(name = "weav_cloth_status") | |||
private Integer weavClothStatus; | |||
/** | |||
* 绑定公司id | |||
*/ | |||
@Column(name = "company_id") | |||
private Integer companyId; | |||
/** | |||
* 产品id,关联产品表:mt_alone_by_product_info | |||
*/ | |||
@Column(name = "product_id") | |||
private Integer productId; | |||
/** | |||
* 是否在库存,0 在库存,1部分库存,2库存没有 | |||
*/ | |||
@Column(name = "is_stock") | |||
private Integer isStock; | |||
/** | |||
* 库存长度 | |||
*/ | |||
@Column(name = "weav_cloth_length") | |||
private Float weavClothLength; | |||
/** | |||
* 当前进度,匹配字典表编码,内容:买原料,牵经,织机在织 | |||
*/ | |||
@Column(name = "curr_progress") | |||
private String currProgress; | |||
/** | |||
* 供应商id ,管理供应商表:mt_alone_processor | |||
*/ | |||
@Column(name = "supplier_id") | |||
private Integer supplierId; | |||
/** | |||
* 供应商编号,选择获取 | |||
*/ | |||
@Column(name = "supplier_code") | |||
private String supplierCode; | |||
/** | |||
* 计划长度(M) | |||
*/ | |||
@Column(name = "plan_length") | |||
private Float planLength; | |||
/** | |||
* 实际长度(M) | |||
*/ | |||
@Column(name = "actual_length") | |||
private Float actualLength; | |||
/** | |||
* 缩率%,=实际长度/计划长度 *100% | |||
*/ | |||
private String shrinkage; | |||
/** | |||
* 费用(元) | |||
*/ | |||
private Float cost; | |||
/** | |||
* 开始时间 | |||
*/ | |||
@Column(name = "begin_time") | |||
private Date beginTime; | |||
/** | |||
* 结束时间 | |||
*/ | |||
@Column(name = "end_time") | |||
private Date endTime; | |||
/** | |||
* 备注 | |||
*/ | |||
private String note; | |||
/** | |||
* @return id | |||
*/ | |||
public Integer getId() { | |||
return id; | |||
} | |||
/** | |||
* @param id | |||
*/ | |||
public void setId(Integer id) { | |||
this.id = id; | |||
} | |||
/** | |||
* 获取操作员id | |||
* | |||
* @return operator_id - 操作员id | |||
*/ | |||
public Integer getOperatorId() { | |||
return operatorId; | |||
} | |||
/** | |||
* 设置操作员id | |||
* | |||
* @param operatorId 操作员id | |||
*/ | |||
public void setOperatorId(Integer operatorId) { | |||
this.operatorId = operatorId; | |||
} | |||
/** | |||
* 获取添加时间 | |||
* | |||
* @return create_time - 添加时间 | |||
*/ | |||
public Date getCreateTime() { | |||
return createTime; | |||
} | |||
/** | |||
* 设置添加时间 | |||
* | |||
* @param createTime 添加时间 | |||
*/ | |||
public void setCreateTime(Date createTime) { | |||
this.createTime = createTime; | |||
} | |||
/** | |||
* 获取修改时间 | |||
* | |||
* @return update_time - 修改时间 | |||
*/ | |||
public Date getUpdateTime() { | |||
return updateTime; | |||
} | |||
/** | |||
* 设置修改时间 | |||
* | |||
* @param updateTime 修改时间 | |||
*/ | |||
public void setUpdateTime(Date updateTime) { | |||
this.updateTime = updateTime; | |||
} | |||
/** | |||
* 获取创建人id | |||
* | |||
* @return creator_id - 创建人id | |||
*/ | |||
public Integer getCreatorId() { | |||
return creatorId; | |||
} | |||
/** | |||
* 设置创建人id | |||
* | |||
* @param creatorId 创建人id | |||
*/ | |||
public void setCreatorId(Integer creatorId) { | |||
this.creatorId = creatorId; | |||
} | |||
/** | |||
* 获取更新人id | |||
* | |||
* @return updater_id - 更新人id | |||
*/ | |||
public Integer getUpdaterId() { | |||
return updaterId; | |||
} | |||
/** | |||
* 设置更新人id | |||
* | |||
* @param updaterId 更新人id | |||
*/ | |||
public void setUpdaterId(Integer updaterId) { | |||
this.updaterId = updaterId; | |||
} | |||
/** | |||
* 获取版本号 默认为 1 | |||
* | |||
* @return version - 版本号 默认为 1 | |||
*/ | |||
public String getVersion() { | |||
return version; | |||
} | |||
/** | |||
* 设置版本号 默认为 1 | |||
* | |||
* @param version 版本号 默认为 1 | |||
*/ | |||
public void setVersion(String version) { | |||
this.version = version; | |||
} | |||
/** | |||
* 获取状态 0处理中,1处理完成,2逻辑删除 | |||
* | |||
* @return weav_cloth_status - 状态 0处理中,1处理完成,2逻辑删除 | |||
*/ | |||
public Integer getWeavClothStatus() { | |||
return weavClothStatus; | |||
} | |||
/** | |||
* 设置状态 0处理中,1处理完成,2逻辑删除 | |||
* | |||
* @param weavClothStatus 状态 0处理中,1处理完成,2逻辑删除 | |||
*/ | |||
public void setWeavClothStatus(Integer weavClothStatus) { | |||
this.weavClothStatus = weavClothStatus; | |||
} | |||
/** | |||
* 获取绑定公司id | |||
* | |||
* @return company_id - 绑定公司id | |||
*/ | |||
public Integer getCompanyId() { | |||
return companyId; | |||
} | |||
/** | |||
* 设置绑定公司id | |||
* | |||
* @param companyId 绑定公司id | |||
*/ | |||
public void setCompanyId(Integer companyId) { | |||
this.companyId = companyId; | |||
} | |||
/** | |||
* 获取产品id,关联产品表:mt_alone_by_product_info | |||
* | |||
* @return product_id - 产品id,关联产品表:mt_alone_by_product_info | |||
*/ | |||
public Integer getProductId() { | |||
return productId; | |||
} | |||
/** | |||
* 设置产品id,关联产品表:mt_alone_by_product_info | |||
* | |||
* @param productId 产品id,关联产品表:mt_alone_by_product_info | |||
*/ | |||
public void setProductId(Integer productId) { | |||
this.productId = productId; | |||
} | |||
/** | |||
* 获取是否在库存,0 在库存,1部分库存,2库存没有 | |||
* | |||
* @return is_stock - 是否在库存,0 在库存,1部分库存,2库存没有 | |||
*/ | |||
public Integer getIsStock() { | |||
return isStock; | |||
} | |||
/** | |||
* 设置是否在库存,0 在库存,1部分库存,2库存没有 | |||
* | |||
* @param isStock 是否在库存,0 在库存,1部分库存,2库存没有 | |||
*/ | |||
public void setIsStock(Integer isStock) { | |||
this.isStock = isStock; | |||
} | |||
/** | |||
* 获取库存长度 | |||
* | |||
* @return weav_cloth_length - 库存长度 | |||
*/ | |||
public Float getWeavClothLength() { | |||
return weavClothLength; | |||
} | |||
/** | |||
* 设置库存长度 | |||
* | |||
* @param weavClothLength 库存长度 | |||
*/ | |||
public void setWeavClothLength(Float weavClothLength) { | |||
this.weavClothLength = weavClothLength; | |||
} | |||
/** | |||
* 获取当前进度,匹配字典表编码,内容:买原料,牵经,织机在织 | |||
* | |||
* @return curr_progress - 当前进度,匹配字典表编码,内容:买原料,牵经,织机在织 | |||
*/ | |||
public String getCurrProgress() { | |||
return currProgress; | |||
} | |||
/** | |||
* 设置当前进度,匹配字典表编码,内容:买原料,牵经,织机在织 | |||
* | |||
* @param currProgress 当前进度,匹配字典表编码,内容:买原料,牵经,织机在织 | |||
*/ | |||
public void setCurrProgress(String currProgress) { | |||
this.currProgress = currProgress; | |||
} | |||
/** | |||
* 获取供应商id ,管理供应商表:mt_alone_processor | |||
* | |||
* @return supplier_id - 供应商id ,管理供应商表:mt_alone_processor | |||
*/ | |||
public Integer getSupplierId() { | |||
return supplierId; | |||
} | |||
/** | |||
* 设置供应商id ,管理供应商表:mt_alone_processor | |||
* | |||
* @param supplierId 供应商id ,管理供应商表:mt_alone_processor | |||
*/ | |||
public void setSupplierId(Integer supplierId) { | |||
this.supplierId = supplierId; | |||
} | |||
/** | |||
* 获取供应商编号,选择获取 | |||
* | |||
* @return supplier_code - 供应商编号,选择获取 | |||
*/ | |||
public String getSupplierCode() { | |||
return supplierCode; | |||
} | |||
/** | |||
* 设置供应商编号,选择获取 | |||
* | |||
* @param supplierCode 供应商编号,选择获取 | |||
*/ | |||
public void setSupplierCode(String supplierCode) { | |||
this.supplierCode = supplierCode; | |||
} | |||
/** | |||
* 获取计划长度(M) | |||
* | |||
* @return plan_length - 计划长度(M) | |||
*/ | |||
public Float getPlanLength() { | |||
return planLength; | |||
} | |||
/** | |||
* 设置计划长度(M) | |||
* | |||
* @param planLength 计划长度(M) | |||
*/ | |||
public void setPlanLength(Float planLength) { | |||
this.planLength = planLength; | |||
} | |||
/** | |||
* 获取实际长度(M) | |||
* | |||
* @return actual_length - 实际长度(M) | |||
*/ | |||
public Float getActualLength() { | |||
return actualLength; | |||
} | |||
/** | |||
* 设置实际长度(M) | |||
* | |||
* @param actualLength 实际长度(M) | |||
*/ | |||
public void setActualLength(Float actualLength) { | |||
this.actualLength = actualLength; | |||
} | |||
/** | |||
* 获取缩率%,=实际长度/计划长度 *100% | |||
* | |||
* @return shrinkage - 缩率%,=实际长度/计划长度 *100% | |||
*/ | |||
public String getShrinkage() { | |||
return shrinkage; | |||
} | |||
/** | |||
* 设置缩率%,=实际长度/计划长度 *100% | |||
* | |||
* @param shrinkage 缩率%,=实际长度/计划长度 *100% | |||
*/ | |||
public void setShrinkage(String shrinkage) { | |||
this.shrinkage = shrinkage; | |||
} | |||
/** | |||
* 获取费用(元) | |||
* | |||
* @return cost - 费用(元) | |||
*/ | |||
public Float getCost() { | |||
return cost; | |||
} | |||
/** | |||
* 设置费用(元) | |||
* | |||
* @param cost 费用(元) | |||
*/ | |||
public void setCost(Float cost) { | |||
this.cost = cost; | |||
} | |||
/** | |||
* 获取开始时间 | |||
* | |||
* @return begin_time - 开始时间 | |||
*/ | |||
public Date getBeginTime() { | |||
return beginTime; | |||
} | |||
/** | |||
* 设置开始时间 | |||
* | |||
* @param beginTime 开始时间 | |||
*/ | |||
public void setBeginTime(Date beginTime) { | |||
this.beginTime = beginTime; | |||
} | |||
/** | |||
* 获取结束时间 | |||
* | |||
* @return end_time - 结束时间 | |||
*/ | |||
public Date getEndTime() { | |||
return endTime; | |||
} | |||
/** | |||
* 设置结束时间 | |||
* | |||
* @param endTime 结束时间 | |||
*/ | |||
public void setEndTime(Date endTime) { | |||
this.endTime = endTime; | |||
} | |||
/** | |||
* 获取备注 | |||
* | |||
* @return note - 备注 | |||
*/ | |||
public String getNote() { | |||
return note; | |||
} | |||
/** | |||
* 设置备注 | |||
* | |||
* @param note 备注 | |||
*/ | |||
public void setNote(String note) { | |||
this.note = note; | |||
} | |||
} |
@@ -0,0 +1,9 @@ | |||
package com.deer.wms.produce.clothflow.model; | |||
import com.deer.wms.project.seed.core.service.QueryParams; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
public class MtAloneByWeavClothParams extends QueryParams { | |||
} |
@@ -0,0 +1,17 @@ | |||
package com.deer.wms.produce.clothflow.service; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfo; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfoParams; | |||
import com.deer.wms.project.seed.core.service.Service; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
public interface MtAloneByOrderInfoService extends Service<MtAloneByOrderInfo, Integer> { | |||
List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params) ; | |||
} |
@@ -0,0 +1,17 @@ | |||
package com.deer.wms.produce.clothflow.service; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByProductInfo; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByProductInfoParams; | |||
import com.deer.wms.project.seed.core.service.Service; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
public interface MtAloneByProductInfoService extends Service<MtAloneByProductInfo, Integer> { | |||
List<MtAloneByProductInfo> findList(MtAloneByProductInfoParams params) ; | |||
} |
@@ -0,0 +1,17 @@ | |||
package com.deer.wms.produce.clothflow.service; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByWeavCloth; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByWeavClothParams; | |||
import com.deer.wms.project.seed.core.service.Service; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
public interface MtAloneByWeavClothService extends Service<MtAloneByWeavCloth, Integer> { | |||
List<MtAloneByWeavCloth> findList(MtAloneByWeavClothParams params) ; | |||
} |
@@ -0,0 +1,29 @@ | |||
package com.deer.wms.produce.clothflow.service.impl; | |||
import com.deer.wms.produce.clothflow.dao.MtAloneByOrderInfoMapper; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfo; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfoParams; | |||
import com.deer.wms.produce.clothflow.service.MtAloneByOrderInfoService; | |||
import com.deer.wms.project.seed.core.service.AbstractService; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Service; | |||
import org.springframework.transaction.annotation.Transactional; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
@Service | |||
@Transactional | |||
public class MtAloneByOrderInfoServiceImpl extends AbstractService<MtAloneByOrderInfo, Integer> implements MtAloneByOrderInfoService { | |||
@Autowired | |||
private MtAloneByOrderInfoMapper mtAloneByOrderInfoMapper; | |||
@Override | |||
public List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params) { | |||
return mtAloneByOrderInfoMapper.findList(params); | |||
} | |||
} |
@@ -0,0 +1,29 @@ | |||
package com.deer.wms.produce.clothflow.service.impl; | |||
import com.deer.wms.produce.clothflow.dao.MtAloneByProductInfoMapper; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByProductInfo; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByProductInfoParams; | |||
import com.deer.wms.produce.clothflow.service.MtAloneByProductInfoService; | |||
import com.deer.wms.project.seed.core.service.AbstractService; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Service; | |||
import org.springframework.transaction.annotation.Transactional; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
@Service | |||
@Transactional | |||
public class MtAloneByProductInfoServiceImpl extends AbstractService<MtAloneByProductInfo, Integer> implements MtAloneByProductInfoService { | |||
@Autowired | |||
private MtAloneByProductInfoMapper mtAloneByProductInfoMapper; | |||
@Override | |||
public List<MtAloneByProductInfo> findList(MtAloneByProductInfoParams params) { | |||
return mtAloneByProductInfoMapper.findList(params); | |||
} | |||
} |
@@ -0,0 +1,29 @@ | |||
package com.deer.wms.produce.clothflow.service.impl; | |||
import com.deer.wms.produce.clothflow.dao.MtAloneByWeavClothMapper; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByWeavCloth; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByWeavClothParams; | |||
import com.deer.wms.produce.clothflow.service.MtAloneByWeavClothService; | |||
import com.deer.wms.project.seed.core.service.AbstractService; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Service; | |||
import org.springframework.transaction.annotation.Transactional; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
@Service | |||
@Transactional | |||
public class MtAloneByWeavClothServiceImpl extends AbstractService<MtAloneByWeavCloth, Integer> implements MtAloneByWeavClothService { | |||
@Autowired | |||
private MtAloneByWeavClothMapper mtAloneByWeavClothMapper; | |||
@Override | |||
public List<MtAloneByWeavCloth> findList(MtAloneByWeavClothParams params) { | |||
return mtAloneByWeavClothMapper.findList(params); | |||
} | |||
} |
@@ -0,0 +1,92 @@ | |||
package com.deer.wms.produce.clothflow.web; | |||
import com.deer.wms.project.seed.annotation.OperateLog; | |||
import com.deer.wms.project.seed.constant.SystemManageConstant; | |||
import com.deer.wms.project.seed.core.result.CommonCode; | |||
import com.deer.wms.project.seed.core.result.Result; | |||
import com.deer.wms.project.seed.core.result.ResultGenerator; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfo; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfoParams; | |||
import com.deer.wms.produce.clothflow.service.MtAloneByOrderInfoService; | |||
import com.deer.wms.intercept.annotation.User; | |||
import com.deer.wms.intercept.common.data.CurrentUser; | |||
import com.github.pagehelper.PageHelper; | |||
import com.github.pagehelper.PageInfo; | |||
import io.swagger.annotations.Api; | |||
import io.swagger.annotations.ApiOperation; | |||
import springfox.documentation.annotations.ApiIgnore; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.web.bind.annotation.*; | |||
import java.util.Date; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
@Api(description = "xxx接口") | |||
@RestController | |||
@RequestMapping("/mt/alone/by/order/infos") | |||
public class MtAloneByOrderInfoController { | |||
@Autowired | |||
private MtAloneByOrderInfoService mtAloneByOrderInfoService; | |||
@OperateLog(description = "添加xxx", type = "增加") | |||
@ApiOperation(value = "添加xxx", notes = "添加xxx") | |||
@PostMapping("/add") | |||
public Result add(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo, @ApiIgnore @User CurrentUser currentUser) { | |||
if(currentUser==null){ | |||
return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); | |||
} | |||
mtAloneByOrderInfo.setCreateTime(new Date()); | |||
mtAloneByOrderInfo.setCompanyId(currentUser.getCompanyId()); | |||
mtAloneByOrderInfoService.save(mtAloneByOrderInfo); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@OperateLog(description = "删除xxx", type = "删除") | |||
@ApiOperation(value = "删除xxx", notes = "删除xxx") | |||
@DeleteMapping("/delete/{id}") | |||
public Result delete(@PathVariable Integer Id) { | |||
mtAloneByOrderInfoService.deleteById(mtAloneByOrderInfoId); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@OperateLog(description = "修改xxx", type = "更新") | |||
@ApiOperation(value = "修改xxx", notes = "修改xxx") | |||
@PostMapping("/update") | |||
public Result update(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo) { | |||
mtAloneByOrderInfo.setUpdateTime(new Date()); | |||
mtAloneByOrderInfoService.update(mtAloneByOrderInfo); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@GetMapping("/detail/{id}") | |||
public Result detail(@PathVariable Integer id) { | |||
MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id); | |||
return ResultGenerator.genSuccessResult(mtAloneByOrderInfo); | |||
} | |||
@GetMapping("/list") | |||
public Result list(MtAloneByOrderInfoParams params, @ApiIgnore @User CurrentUser currentUser) { | |||
if(currentUser==null){ | |||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); | |||
} | |||
if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ | |||
params.setCompanyId(currentUser.getCompanyId()); | |||
}else{ | |||
params.setCompanyId(null); | |||
} | |||
PageHelper.startPage(params.getPageNum(), params.getPageSize()); | |||
List<MtAloneByOrderInfo> list = mtAloneByOrderInfoService.findList(params); | |||
PageInfo pageInfo = new PageInfo(list); | |||
return ResultGenerator.genSuccessResult(pageInfo); | |||
} | |||
} |
@@ -0,0 +1,92 @@ | |||
package com.deer.wms.produce.clothflow.web; | |||
import com.deer.wms.project.seed.annotation.OperateLog; | |||
import com.deer.wms.project.seed.constant.SystemManageConstant; | |||
import com.deer.wms.project.seed.core.result.CommonCode; | |||
import com.deer.wms.project.seed.core.result.Result; | |||
import com.deer.wms.project.seed.core.result.ResultGenerator; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByProductInfo; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByProductInfoParams; | |||
import com.deer.wms.produce.clothflow.service.MtAloneByProductInfoService; | |||
import com.deer.wms.intercept.annotation.User; | |||
import com.deer.wms.intercept.common.data.CurrentUser; | |||
import com.github.pagehelper.PageHelper; | |||
import com.github.pagehelper.PageInfo; | |||
import io.swagger.annotations.Api; | |||
import io.swagger.annotations.ApiOperation; | |||
import springfox.documentation.annotations.ApiIgnore; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.web.bind.annotation.*; | |||
import java.util.Date; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
@Api(description = "xxx接口") | |||
@RestController | |||
@RequestMapping("/mt/alone/by/product/infos") | |||
public class MtAloneByProductInfoController { | |||
@Autowired | |||
private MtAloneByProductInfoService mtAloneByProductInfoService; | |||
@OperateLog(description = "添加xxx", type = "增加") | |||
@ApiOperation(value = "添加xxx", notes = "添加xxx") | |||
@PostMapping("/add") | |||
public Result add(@RequestBody MtAloneByProductInfo mtAloneByProductInfo, @ApiIgnore @User CurrentUser currentUser) { | |||
if(currentUser==null){ | |||
return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); | |||
} | |||
mtAloneByProductInfo.setCreateTime(new Date()); | |||
mtAloneByProductInfo.setCompanyId(currentUser.getCompanyId()); | |||
mtAloneByProductInfoService.save(mtAloneByProductInfo); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@OperateLog(description = "删除xxx", type = "删除") | |||
@ApiOperation(value = "删除xxx", notes = "删除xxx") | |||
@DeleteMapping("/delete/{id}") | |||
public Result delete(@PathVariable Integer Id) { | |||
mtAloneByProductInfoService.deleteById(mtAloneByProductInfoId); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@OperateLog(description = "修改xxx", type = "更新") | |||
@ApiOperation(value = "修改xxx", notes = "修改xxx") | |||
@PostMapping("/update") | |||
public Result update(@RequestBody MtAloneByProductInfo mtAloneByProductInfo) { | |||
mtAloneByProductInfo.setUpdateTime(new Date()); | |||
mtAloneByProductInfoService.update(mtAloneByProductInfo); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@GetMapping("/detail/{id}") | |||
public Result detail(@PathVariable Integer id) { | |||
MtAloneByProductInfo mtAloneByProductInfo = mtAloneByProductInfoService.findById(id); | |||
return ResultGenerator.genSuccessResult(mtAloneByProductInfo); | |||
} | |||
@GetMapping("/list") | |||
public Result list(MtAloneByProductInfoParams params, @ApiIgnore @User CurrentUser currentUser) { | |||
if(currentUser==null){ | |||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); | |||
} | |||
if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ | |||
params.setCompanyId(currentUser.getCompanyId()); | |||
}else{ | |||
params.setCompanyId(null); | |||
} | |||
PageHelper.startPage(params.getPageNum(), params.getPageSize()); | |||
List<MtAloneByProductInfo> list = mtAloneByProductInfoService.findList(params); | |||
PageInfo pageInfo = new PageInfo(list); | |||
return ResultGenerator.genSuccessResult(pageInfo); | |||
} | |||
} |
@@ -0,0 +1,92 @@ | |||
package com.deer.wms.produce.clothflow.web; | |||
import com.deer.wms.project.seed.annotation.OperateLog; | |||
import com.deer.wms.project.seed.constant.SystemManageConstant; | |||
import com.deer.wms.project.seed.core.result.CommonCode; | |||
import com.deer.wms.project.seed.core.result.Result; | |||
import com.deer.wms.project.seed.core.result.ResultGenerator; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByWeavCloth; | |||
import com.deer.wms.produce.clothflow.model.MtAloneByWeavClothParams; | |||
import com.deer.wms.produce.clothflow.service.MtAloneByWeavClothService; | |||
import com.deer.wms.intercept.annotation.User; | |||
import com.deer.wms.intercept.common.data.CurrentUser; | |||
import com.github.pagehelper.PageHelper; | |||
import com.github.pagehelper.PageInfo; | |||
import io.swagger.annotations.Api; | |||
import io.swagger.annotations.ApiOperation; | |||
import springfox.documentation.annotations.ApiIgnore; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.web.bind.annotation.*; | |||
import java.util.Date; | |||
import java.util.List; | |||
/** | |||
* Created by on 2020/08/18. | |||
*/ | |||
@Api(description = "xxx接口") | |||
@RestController | |||
@RequestMapping("/mt/alone/by/weav/cloths") | |||
public class MtAloneByWeavClothController { | |||
@Autowired | |||
private MtAloneByWeavClothService mtAloneByWeavClothService; | |||
@OperateLog(description = "添加xxx", type = "增加") | |||
@ApiOperation(value = "添加xxx", notes = "添加xxx") | |||
@PostMapping("/add") | |||
public Result add(@RequestBody MtAloneByWeavCloth mtAloneByWeavCloth, @ApiIgnore @User CurrentUser currentUser) { | |||
if(currentUser==null){ | |||
return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); | |||
} | |||
mtAloneByWeavCloth.setCreateTime(new Date()); | |||
mtAloneByWeavCloth.setCompanyId(currentUser.getCompanyId()); | |||
mtAloneByWeavClothService.save(mtAloneByWeavCloth); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@OperateLog(description = "删除xxx", type = "删除") | |||
@ApiOperation(value = "删除xxx", notes = "删除xxx") | |||
@DeleteMapping("/delete/{id}") | |||
public Result delete(@PathVariable Integer Id) { | |||
mtAloneByWeavClothService.deleteById(mtAloneByWeavClothId); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@OperateLog(description = "修改xxx", type = "更新") | |||
@ApiOperation(value = "修改xxx", notes = "修改xxx") | |||
@PostMapping("/update") | |||
public Result update(@RequestBody MtAloneByWeavCloth mtAloneByWeavCloth) { | |||
mtAloneByWeavCloth.setUpdateTime(new Date()); | |||
mtAloneByWeavClothService.update(mtAloneByWeavCloth); | |||
return ResultGenerator.genSuccessResult(); | |||
} | |||
@GetMapping("/detail/{id}") | |||
public Result detail(@PathVariable Integer id) { | |||
MtAloneByWeavCloth mtAloneByWeavCloth = mtAloneByWeavClothService.findById(id); | |||
return ResultGenerator.genSuccessResult(mtAloneByWeavCloth); | |||
} | |||
@GetMapping("/list") | |||
public Result list(MtAloneByWeavClothParams params, @ApiIgnore @User CurrentUser currentUser) { | |||
if(currentUser==null){ | |||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); | |||
} | |||
if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ | |||
params.setCompanyId(currentUser.getCompanyId()); | |||
}else{ | |||
params.setCompanyId(null); | |||
} | |||
PageHelper.startPage(params.getPageNum(), params.getPageSize()); | |||
List<MtAloneByWeavCloth> list = mtAloneByWeavClothService.findList(params); | |||
PageInfo pageInfo = new PageInfo(list); | |||
return ResultGenerator.genSuccessResult(pageInfo); | |||
} | |||
} |