diff --git a/mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java b/mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java index 22e710a..37482fa 100644 --- a/mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java +++ b/mes/src/main/java/com/wangziyang/mes/common/util/CodeGenerator.java @@ -40,11 +40,11 @@ public class CodeGenerator { // 数据源配置 DataSourceConfig dsc = new DataSourceConfig(); - dsc.setUrl("jdbc:mysql://192.168.52.76:3306/sparchetype?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong&allowPublicKeyRetrieval=true"); + dsc.setUrl("jdbc:mysql://rm-8vb0sazu4d9g0u290eo.mysql.zhangbei.rds.aliyuncs.com:3306/sparchetype?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong&allowPublicKeyRetrieval=true"); // dsc.setSchemaName("public"); dsc.setDriverName("com.mysql.cj.jdbc.Driver"); - dsc.setUsername("admin"); - dsc.setPassword("123456"); + dsc.setUsername("admin_123"); + dsc.setPassword("Wangzi!!!111"); mpg.setDataSource(dsc); // 包配置 diff --git a/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java b/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java new file mode 100644 index 0000000..06a0f60 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java @@ -0,0 +1,21 @@ +package com.wangziyang.mes.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import com.wangziyang.mes.common.BaseController; + +/** + *

+ * 前端控制器 + *

+ * + * @author WangZiYang + * @since 2020-07-01 + */ +@Controller +@RequestMapping("/order/sp-order") +public class SpOrderController extends BaseController { + +} diff --git a/mes/src/main/java/com/wangziyang/mes/order/entity/SpOrder.java b/mes/src/main/java/com/wangziyang/mes/order/entity/SpOrder.java new file mode 100644 index 0000000..51ffb5a --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/order/entity/SpOrder.java @@ -0,0 +1,153 @@ +package com.wangziyang.mes.order.entity; + +import com.wangziyang.mes.common.BaseEntity; + +/** + *

+ * + *

+ * + * @author WangZiYang + * @since 2020-07-01 + */ +public class SpOrder extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 工单编号 + */ + private String orderCode; + + /** + * 工单描述 + */ + private String orderDescription; + + /** + * 工单数量 + */ + private Integer qty; + + /** + * 订单类型 P 量产 A验证 F返工 + */ + private String orderType; + + /** + * 流程ID + */ + private String flowId; + + /** + * 物料编码 + */ + private String materiel; + + /** + * 物料描述 + */ + private String materielDesc; + + /** + * 计划开始时间 + */ + private String planStartTime; + + /** + * 计划结束时间 + */ + private String planEndTime; + + /** + * 1,创建 2 进行中，3订单结束，4订单终结 + */ + private Integer statue; + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + public String getOrderDescription() { + return orderDescription; + } + + public void setOrderDescription(String orderDescription) { + this.orderDescription = orderDescription; + } + public Integer getQty() { + return qty; + } + + public void setQty(Integer qty) { + this.qty = qty; + } + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + public String getFlowId() { + return flowId; + } + + public void setFlowId(String flowId) { + this.flowId = flowId; + } + public String getMateriel() { + return materiel; + } + + public void setMateriel(String materiel) { + this.materiel = materiel; + } + public String getMaterielDesc() { + return materielDesc; + } + + public void setMaterielDesc(String materielDesc) { + this.materielDesc = materielDesc; + } + public String getPlanStartTime() { + return planStartTime; + } + + public void setPlanStartTime(String planStartTime) { + this.planStartTime = planStartTime; + } + public String getPlanEndTime() { + return planEndTime; + } + + public void setPlanEndTime(String planEndTime) { + this.planEndTime = planEndTime; + } + public Integer getStatue() { + return statue; + } + + public void setStatue(Integer statue) { + this.statue = statue; + } + + @Override + public String toString() { + return "SpOrder{" + + "orderCode=" + orderCode + + ", orderDescription=" + orderDescription + + ", qty=" + qty + + ", orderType=" + orderType + + ", flowId=" + flowId + + ", materiel=" + materiel + + ", materielDesc=" + materielDesc + + ", planStartTime=" + planStartTime + + ", planEndTime=" + planEndTime + + ", statue=" + statue + + "}"; + } +} diff --git a/mes/src/main/java/com/wangziyang/mes/order/mapper/SpOrderMapper.java b/mes/src/main/java/com/wangziyang/mes/order/mapper/SpOrderMapper.java new file mode 100644 index 0000000..6ad7bb1 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/order/mapper/SpOrderMapper.java @@ -0,0 +1,16 @@ +package com.wangziyang.mes.order.mapper; + +import com.wangziyang.mes.order.entity.SpOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author WangZiYang + * @since 2020-07-01 + */ +public interface SpOrderMapper extends BaseMapper { + +} diff --git a/mes/src/main/java/com/wangziyang/mes/order/service/ISpOrderService.java b/mes/src/main/java/com/wangziyang/mes/order/service/ISpOrderService.java new file mode 100644 index 0000000..280cc89 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/order/service/ISpOrderService.java @@ -0,0 +1,16 @@ +package com.wangziyang.mes.order.service; + +import com.wangziyang.mes.order.entity.SpOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author WangZiYang + * @since 2020-07-01 + */ +public interface ISpOrderService extends IService { + +} diff --git a/mes/src/main/java/com/wangziyang/mes/order/service/impl/SpOrderServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/order/service/impl/SpOrderServiceImpl.java new file mode 100644 index 0000000..ec46429 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/order/service/impl/SpOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.wangziyang.mes.order.service.impl; + +import com.wangziyang.mes.order.entity.SpOrder; +import com.wangziyang.mes.order.mapper.SpOrderMapper; +import com.wangziyang.mes.order.service.ISpOrderService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author WangZiYang + * @since 2020-07-01 + */ +@Service +public class SpOrderServiceImpl extends ServiceImpl implements ISpOrderService { + +} diff --git a/mes/src/main/resources/mapper/order/SpOrderMapper.xml b/mes/src/main/resources/mapper/order/SpOrderMapper.xml new file mode 100644 index 0000000..49b90bd --- /dev/null +++ b/mes/src/main/resources/mapper/order/SpOrderMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/src/main/resources/templates/order/production/addOrUpdate.ftl b/mes/src/main/resources/templates/order/production/addOrUpdate.ftl new file mode 100644 index 0000000..7515996 --- /dev/null +++ b/mes/src/main/resources/templates/order/production/addOrUpdate.ftl @@ -0,0 +1,226 @@ + + + + + 添加用户 + + + + <#include "${request.contextPath}/common/common.ftl"> + + + + + +
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+ checked> + checked> + checked> +
+
+
+
+
+ + +
+
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/mes/src/main/resources/templates/order/production/list.ftl b/mes/src/main/resources/templates/order/production/list.ftl new file mode 100644 index 0000000..55f93a3 --- /dev/null +++ b/mes/src/main/resources/templates/order/production/list.ftl @@ -0,0 +1,200 @@ + + + + + 系统角色列表 + + + + <#include "${request.contextPath}/common/common.ftl"> + + +
+
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+ + +
+
+
+ + + + + + + + + + + \ No newline at end of file