Skip to content

K
kwell-mes
Commit 070ba420 authored by 周毅's avatar 周毅
Browse files
Options

调整代码

parent 5ba74e98
Expand all Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 11659 deletions
gavel/pom.xml
View file @ 070ba420
......@@ -104,12 +104,6 @@
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.gavel.platform</groupId>
<artifactId>gavel-devonline</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.gavel.platform</groupId>
<artifactId>gavel-timer</artifactId>
......@@ -236,33 +230,6 @@
<encoding>utf-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.4</version>
<executions>
<execution>
<id>get-the-git-infos</id>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
<prefix>git</prefix>
<verbose>false</verbose>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
<format>json</format>
<gitDescribe>
<skip>false</skip>
<always>false</always>
<dirty>-dirty</dirty>
</gitDescribe>
</configuration>
</plugin>
</plugins>
</build>
......
gavel/src/main/java/com/gavel/kwell/controller/GpfkhzController.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.controller;
import com.alibaba.fastjson.JSONObject;
import com.gavel.common.BaseURL;
import com.gavel.common.SystemOperation;
import com.gavel.common.annotation.ResourcePermissions;
import com.gavel.common.base.controller.BaseController;
import com.gavel.common.converter.DataConvert;
import com.gavel.common.utils.StringUtils;
import com.gavel.kwell.service.GpfkhzService;
import com.gavel.kwell.utils.GpfkhzEnum;
import com.gavel.kwell.vo.GpfkhzCondition;
import com.gavel.kwell.vo.GpfkhzVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@Controller
@RequestMapping("kmes/gpfkhz")
public class GpfkhzController extends BaseController {
@Autowired
private GpfkhzService gpfkhzService;
@RequestMapping("/index")
public String index() {
return "kmes/gpfkhz/index";
}
@RequestMapping(value = BaseURL.QUERY, method = RequestMethod.POST)
@ResponseBody
public Object query(@RequestBody GpfkhzCondition condition) {
if(StringUtils.isEmpty(condition.getHzfs())){
setReturnMessage("汇总方式不允许为空，请重新选择！");
return returnData();
}
List<GpfkhzVO> records = gpfkhzService.queryGpfkhz(condition);
return buildReturnData(records, GpfkhzVO.class);
}
@ResourcePermissions({SystemOperation.BottonResource.EXPORT})
@RequestMapping(value = BaseURL.EXPORT, method = RequestMethod.POST)
@ResponseBody
public void export(HttpServletRequest request,HttpServletResponse response, @RequestBody JSONObject param) throws Exception {
GpfkhzCondition condition = DataConvert.getCondition(param.getJSONObject("condition"), GpfkhzCondition.class);
List<GpfkhzVO> records = gpfkhzService.queryGpfkhz(condition);
doExport(request, response, param, records);
}
@RequestMapping(value = "init/hzfs", method = RequestMethod.POST)
@ResponseBody
public Object initHzfs() {
return buildReturnData(GpfkhzEnum.toList());
}
@RequestMapping(value = "init/gxname", method = RequestMethod.POST)
@ResponseBody
public Object initGxname() {
return buildReturnData(gpfkhzService.listBzgxName());
}
}
gavel/src/main/java/com/gavel/kwell/controller/HzfklogController.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.controller;
import com.gavel.common.BaseURL;
import com.gavel.common.base.BaseEditJSON;
import com.gavel.common.base.controller.BaseController;
import com.gavel.common.converter.DataConvert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.common.annotation.ResourcePermissions;
import com.gavel.common.SystemOperation;
import com.alibaba.fastjson.JSONObject;
import com.gavel.common.utils.ThreadContext;
import com.gavel.kwell.service.HzfklogService;
import com.gavel.kwell.vo.HzfklogCondition;
import com.gavel.kwell.vo.HzfklogVO;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@Controller
@RequestMapping("hzgd/hzfklog")
public class HzfklogController extends BaseController {
@Autowired
private HzfklogService hzfklogService;
@ResourcePermissions()
@RequestMapping("/index")
public String index() {
return "hzgd/hzfklog/index";
}
@ResourcePermissions({SystemOperation.BottonResource.ADD})
@RequestMapping("/add")
public String add() {
return "hzgd/hzfklog/edit";
}
@ResourcePermissions({SystemOperation.BottonResource.EDIT})
@RequestMapping("/edit")
public String edit() {
return "hzgd/hzfklog/edit";
}
@RequestMapping(value = BaseURL.GET, method = RequestMethod.POST)
@ResponseBody
public Object get(@RequestBody JSONObject param) {
HzfklogCondition condition = DataConvert.getCondition(param, HzfklogCondition.class);
RecordSet<HzfklogVO> records = hzfklogService.query(condition);
if ( records.getRecords()!=null && records.getRecords().size()>=1 ){
return buildReturnData(HzfklogVO.class, records.getRecords().get(0));
}
return buildReturnData(HzfklogVO.class, null);
}
@RequestMapping(value = BaseURL.QUERY, method = RequestMethod.POST)
@ResponseBody
public Object query(@RequestBody JSONObject param) {
HzfklogCondition condition = DataConvert.getCondition(param, HzfklogCondition.class);
RecordSet<HzfklogVO> records = hzfklogService.query(condition);
return buildReturnData(records, HzfklogVO.class);
}
@ResourcePermissions(SystemOperation.BottonResource.ADD)
@RequestMapping(value = BaseURL.ADD, method = RequestMethod.POST)
@ResponseBody
public Object insert(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
hzfklogService.insert(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.EDIT)
@RequestMapping(value = BaseURL.UPDATE, method = RequestMethod.POST)
@ResponseBody
public Object update(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
hzfklogService.update(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.DELETE)
@RequestMapping(value = BaseURL.DELETE, method = RequestMethod.POST)
@ResponseBody
public Object delete(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
hzfklogService.delete(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.EXPORT)
@RequestMapping(value = BaseURL.EXPORT, method = RequestMethod.POST)
@ResponseBody
public void export(HttpServletRequest request,HttpServletResponse response, @RequestBody JSONObject param) throws Exception {
HzfklogCondition condition = DataConvert.getCondition(param, HzfklogCondition.class);
RecordSet<HzfklogVO> records = hzfklogService.query(condition);
doExport(request, response, param, records.getRecords());
}
}
gavel/src/main/java/com/gavel/kwell/controller/U_coderuleController.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.controller;
import com.alibaba.fastjson.JSONObject;
import com.gavel.common.BaseURL;
import com.gavel.common.SystemOperation;
import com.gavel.common.annotation.ResourcePermissions;
import com.gavel.common.base.BaseEditJSON;
import com.gavel.common.base.controller.BaseController;
import com.gavel.common.converter.DataConvert;
import com.gavel.common.utils.NumberUtils;
import com.gavel.common.utils.StringUtils;
import com.gavel.common.utils.ThreadContext;
import com.gavel.kwell.service.U_coderuleService;
import com.gavel.kwell.utils.CRTableTypeEnum;
import com.gavel.kwell.utils.CRTypeEnum;
import com.gavel.kwell.vo.*;
import com.gavel.persistence.sql.RecordSet;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@Controller
@RequestMapping("kmes/coderule")
public class U_coderuleController extends BaseController {
@Autowired
private U_coderuleService u_coderuleService;
@ResourcePermissions()
@RequestMapping("/index")
public String index() {
return "kmes/coderule/index";
}
@ResourcePermissions({SystemOperation.BottonResource.ADD})
@RequestMapping("/add")
public String add() {
return "kmes/coderule/edit";
}
@ResourcePermissions({SystemOperation.BottonResource.EDIT})
@RequestMapping("/edit")
public String edit() {
return "kmes/coderule/edit";
}
@RequestMapping(value = BaseURL.GET, method = RequestMethod.POST)
@ResponseBody
public Object get(@RequestBody JSONObject param) {
U_coderuleCondition condition = DataConvert.getCondition(param, U_coderuleCondition.class);
RecordSet<U_coderuleVO> records = u_coderuleService.query(condition);
if ( records.getRecords()!=null && records.getRecords().size()>=1 ){
return buildReturnData(U_coderuleVO.class, records.getRecords().get(0));
}
return buildReturnData(U_coderuleVO.class, null);
}
@RequestMapping(value = BaseURL.QUERY, method = RequestMethod.POST)
@ResponseBody
public Object query(@RequestBody JSONObject param) {
U_coderuleCondition condition = DataConvert.getCondition(param, U_coderuleCondition.class);
RecordSet<U_coderuleVO> records = u_coderuleService.query(condition);
return buildReturnData(records, U_coderuleVO.class);
}
@ResourcePermissions(SystemOperation.BottonResource.ADD)
@RequestMapping(value = BaseURL.ADD, method = RequestMethod.POST)
@ResponseBody
public Object insert(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
u_coderuleService.insert(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.EDIT)
@RequestMapping(value = BaseURL.UPDATE, method = RequestMethod.POST)
@ResponseBody
public Object update(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
u_coderuleService.update(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.DELETE)
@RequestMapping(value = BaseURL.DELETE, method = RequestMethod.POST)
@ResponseBody
public Object delete(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
u_coderuleService.delete(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.EXPORT)
@RequestMapping(value = BaseURL.EXPORT, method = RequestMethod.POST)
@ResponseBody
public void export(HttpServletRequest request,HttpServletResponse response, @RequestBody JSONObject param) throws Exception {
U_coderuleCondition condition = DataConvert.getCondition(param, U_coderuleCondition.class);
RecordSet<U_coderuleVO> records = u_coderuleService.query(condition);
doExport(request, response, param, records.getRecords());
}
@RequestMapping(value = BaseURL.QUERY_DETAIL, method = RequestMethod.POST)
@ResponseBody
public Object queryDetail(@RequestBody JSONObject param) {
U_coderulemxCondition condition = DataConvert.getCondition(param, U_coderulemxCondition.class);
RecordSet<U_coderulemxVO> records = u_coderuleService.queryDetail(condition);
return buildReturnData(records, U_coderulemxVO.class);
}
@RequestMapping(value = "init/zlx", method = RequestMethod.POST)
@ResponseBody
public Object initZt() {
return buildReturnData(CRTypeEnum.toJsonArray());
}
@ApiOperation(value = "生成条码")
@RequestMapping(value = "/createWosn", method = RequestMethod.POST)
@ResponseBody
public Object createWosn(@RequestBody JSONObject param) {
String woid = param.getString("woid");
List<CodeValueVO> codeValueVOList = DataConvert.getData2List(param.getJSONArray("codeValueList"), CodeValueVO.class);
Integer count = param.getInteger("count");
if(StringUtils.isEmpty(woid)){
setReturnMessage("任务单信息不允许为空！");
return returnData();
}
if(!NumberUtils.Greater(count,0)){
setReturnMessage("生成条码数量必须大于0！");
return returnData();
}
if(codeValueVOList == null || codeValueVOList.size() == 0){
setReturnMessage("条码信息异常，请检查！");
return returnData();
}
u_coderuleService.createWosn(woid,codeValueVOList,count);
return ThreadContext.getReturnData();
}
@ApiOperation(value = "获取当前任务单产品条码规则流水码，传入woid")
@RequestMapping(value = "getNowWosn", method = RequestMethod.POST)
@ResponseBody
public Object getNowWosn(@RequestBody JSONObject param) {
String woid = param.getString("woid");
if(StringUtils.isEmpty(woid)){
setReturnMessage("任务单信息不允许为空，请检查！");
return returnData();
}
Integer nowCode = u_coderuleService.getNowWosnValue(woid, CRTableTypeEnum.WOSN.getId());
if(nowCode != null){
return buildReturnData(nowCode<0?0:nowCode);
}else{
return ThreadContext.getReturnData();
}
}
@ApiOperation(value = "获取当前任务单客户条码规则流水码，传入woid")
@RequestMapping(value = "getNowKhsn", method = RequestMethod.POST)
@ResponseBody
public Object getNowKhsn(@RequestBody JSONObject param) {
String woid = param.getString("woid");
if(StringUtils.isEmpty(woid)){
setReturnMessage("任务单信息不允许为空，请检查！");
return returnData();
}
Integer nowCode = u_coderuleService.getNowWosnValue(woid, CRTableTypeEnum.KHSN.getId());
if(nowCode != null){
return buildReturnData(nowCode);
}else{
return ThreadContext.getReturnData();
}
}
@ApiOperation(value = "重置当前任务单产品条码规则流水码，传入woid，snvalue(修改值)")
@RequestMapping(value = "resetWosn", method = RequestMethod.POST)
@ResponseBody
public Object resetWosn(@RequestBody JSONObject param) {
String woid = param.getString("woid");
Integer value = param.getInteger("snvalue");
if(StringUtils.isEmpty(woid)){
setReturnMessage("任务单信息不允许为空，请检查！");
return returnData();
}
if(NumberUtils.less(value,0)){
setReturnMessage("流水码不允许小于0，请检查！");
return returnData();
}
u_coderuleService.setWosnValue(woid,CRTableTypeEnum.WOSN.getId(),value);
return ThreadContext.getReturnData();
}
@ApiOperation(value = "重置当前任务单客户条码规则流水码，传入woid，snvalue(修改值)")
@RequestMapping(value = "resetKhsn", method = RequestMethod.POST)
@ResponseBody
public Object resetKhsn(@RequestBody JSONObject param) {
String woid = param.getString("woid");
Integer value = param.getInteger("snvalue");
if(StringUtils.isEmpty(woid)){
setReturnMessage("任务单信息不允许为空，请检查！");
return returnData();
}
if(NumberUtils.less(value,0)){
setReturnMessage("流水码不允许小于0，请检查！");
return returnData();
}
u_coderuleService.setWosnValue(woid,CRTableTypeEnum.KHSN.getId(),value);
return ThreadContext.getReturnData();
}
}
gavel/src/main/java/com/gavel/kwell/controller/U_coderulemxController.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.controller;
import com.gavel.common.BaseURL;
import com.gavel.common.base.BaseEditJSON;
import com.gavel.common.base.controller.BaseController;
import com.gavel.common.converter.DataConvert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.common.annotation.ResourcePermissions;
import com.gavel.common.SystemOperation;
import com.alibaba.fastjson.JSONObject;
import com.gavel.common.utils.ThreadContext;
import com.gavel.kwell.service.U_coderulemxService;
import com.gavel.kwell.vo.U_coderulemxCondition;
import com.gavel.kwell.vo.U_coderulemxVO;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@Controller
@RequestMapping("hzgd/u_coderulemx")
public class U_coderulemxController extends BaseController {
@Autowired
private U_coderulemxService u_coderulemxService;
@ResourcePermissions()
@RequestMapping("/index")
public String index() {
return "hzgd/u_coderulemx/index";
}
@ResourcePermissions({SystemOperation.BottonResource.ADD})
@RequestMapping("/add")
public String add() {
return "hzgd/u_coderulemx/edit";
}
@ResourcePermissions({SystemOperation.BottonResource.EDIT})
@RequestMapping("/edit")
public String edit() {
return "hzgd/u_coderulemx/edit";
}
@RequestMapping(value = BaseURL.GET, method = RequestMethod.POST)
@ResponseBody
public Object get(@RequestBody JSONObject param) {
U_coderulemxCondition condition = DataConvert.getCondition(param, U_coderulemxCondition.class);
RecordSet<U_coderulemxVO> records = u_coderulemxService.query(condition);
if ( records.getRecords()!=null && records.getRecords().size()>=1 ){
return buildReturnData(U_coderulemxVO.class, records.getRecords().get(0));
}
return buildReturnData(U_coderulemxVO.class, null);
}
@RequestMapping(value = BaseURL.QUERY, method = RequestMethod.POST)
@ResponseBody
public Object query(@RequestBody JSONObject param) {
U_coderulemxCondition condition = DataConvert.getCondition(param, U_coderulemxCondition.class);
RecordSet<U_coderulemxVO> records = u_coderulemxService.query(condition);
return buildReturnData(records, U_coderulemxVO.class);
}
@ResourcePermissions(SystemOperation.BottonResource.ADD)
@RequestMapping(value = BaseURL.ADD, method = RequestMethod.POST)
@ResponseBody
public Object insert(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
u_coderulemxService.insert(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.EDIT)
@RequestMapping(value = BaseURL.UPDATE, method = RequestMethod.POST)
@ResponseBody
public Object update(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
u_coderulemxService.update(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.DELETE)
@RequestMapping(value = BaseURL.DELETE, method = RequestMethod.POST)
@ResponseBody
public Object delete(@RequestBody JSONObject param) {
BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
u_coderulemxService.delete(editJson);
return ThreadContext.getReturnData();
}
@ResourcePermissions(SystemOperation.BottonResource.EXPORT)
@RequestMapping(value = BaseURL.EXPORT, method = RequestMethod.POST)
@ResponseBody
public void export(HttpServletRequest request,HttpServletResponse response, @RequestBody JSONObject param) throws Exception {
U_coderulemxCondition condition = DataConvert.getCondition(param, U_coderulemxCondition.class);
RecordSet<U_coderulemxVO> records = u_coderulemxService.query(condition);
doExport(request, response, param, records.getRecords());
}
}
gavel/src/main/java/com/gavel/kwell/dao/GpfkhzDao.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao;
import com.gavel.common.base.dao.BaseDao;
import com.gavel.gygl.vo.BzgxVO;
import com.gavel.kwell.vo.GpfkhzCondition;
import com.gavel.kwell.vo.GpfkhzVO;
import java.util.List;
public interface GpfkhzDao extends BaseDao {
public List<GpfkhzVO> queryGpfkhz(GpfkhzCondition condition);
public List<BzgxVO> listBzgxByGzzxCodes(String[] gzzxCodes);
}
gavel/src/main/java/com/gavel/kwell/dao/HzfklogDao.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao;
import com.gavel.common.base.dao.BaseDao;
import com.gavel.kwell.vo.HzfklogCondition;
import com.gavel.kwell.vo.HzfklogVO;
import com.gavel.persistence.sql.RecordSet;
public interface HzfklogDao extends BaseDao {
public RecordSet<HzfklogVO> query(HzfklogCondition condition);
}
gavel/src/main/java/com/gavel/kwell/dao/UWobomDao.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao;
import com.gavel.common.base.dao.BaseDao;
import com.gavel.kwell.vo.UWobomVO;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.wo.vo.WobomCondition;
public interface UWobomDao extends BaseDao {
public RecordSet<UWobomVO> query(WobomCondition condition);
}
gavel/src/main/java/com/gavel/kwell/dao/U_coderuleDao.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao;
import java.util.List;
import com.gavel.common.base.dao.BaseDao;
import com.gavel.common.business.persistent.Autoinc;
import com.gavel.kwell.persistent.U_coderulemx;
import com.gavel.kwell.vo.U_coderuleCondition;
import com.gavel.kwell.vo.U_coderuleVO;
import com.gavel.persistence.sql.RecordSet;
public interface U_coderuleDao extends BaseDao {
public RecordSet<U_coderuleVO> query(U_coderuleCondition condition);
public List<U_coderulemx> queryCodeRulemx(String wlid);
public RecordSet<U_coderuleVO> querySn(U_coderuleCondition condition);
public RecordSet<Autoinc> autonicInfo(U_coderuleCondition condition);
}
gavel/src/main/java/com/gavel/kwell/dao/U_coderulemxDao.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao;
import com.gavel.common.base.dao.BaseDao;
import com.gavel.kwell.vo.U_coderulemxCondition;
import com.gavel.kwell.vo.U_coderulemxVO;
import com.gavel.persistence.sql.RecordSet;
public interface U_coderulemxDao extends BaseDao {
public RecordSet<U_coderulemxVO> query(U_coderulemxCondition condition);
}
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ 070ba420
......@@ -18,7 +18,6 @@ import com.gavel.kwell.dao.GpfkDao;
import com.gavel.kwell.persistent.Gpbhgmx;
import com.gavel.kwell.persistent.Gpfk;
import com.gavel.kwell.persistent.Gpwxmx;
import com.gavel.kwell.utils.DpGradePrintEnum;
import com.gavel.kwell.utils.GpfkFklxEnum;
import com.gavel.kwell.vo.GpWoCondition;
import com.gavel.kwell.vo.GpbhgmxVO;
......@@ -47,8 +46,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" BX_CODE, BX_NAME, BZGX_CODE, BZGX_NAME, ");
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, U_WLXX_BZLHSJ, WO_DJID, ");
sqlMap.append(" DATEDIFF(mi,GPFK_FKSJ,GPFK_FKJSSJ) as gxhs, U_WLXX_JZNAME, ");
sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_YWRQ, GPFK_HGDJ, WOSN_KHCODE, U_WOSN_KHCODEBY1, ");
sqlMap.appendCaseWhenSql("GPFK_HGDJ","hgdjname", DpGradePrintEnum.toJsonArray());
sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_YWRQ, GPFK_HGDJ, WOSN_KHCODE");
sqlMap.append("from GPFK ");
sqlMap.append(" left join BX on BX_ID = GPFK_FKBX ");
sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID ");
......@@ -108,8 +106,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" BX_CODE, BX_NAME, BZGX_CODE, BZGX_NAME, ");
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, U_WLXX_BZLHSJ, WO_DJID, ");
sqlMap.append(" DATEDIFF(mi,GPFK_FKSJ,GPFK_FKJSSJ) as gxhs, U_WLXX_JZNAME, ");
sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_HGDJ, WOSN_KHCODE, U_WOSN_KHCODEBY1, ");
sqlMap.appendCaseWhenSql("GPFK_HGDJ","hgdjname", DpGradePrintEnum.toJsonArray());
sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_HGDJ, WOSN_KHCODE ");
sqlMap.append("from GPFK ");
sqlMap.append(" left join BX on BX_ID = GPFK_FKBX ");
sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID ");
......@@ -1185,8 +1182,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, U_WLXX_BZLHSJ, WO_DJID, ");
sqlMap.append(" DATEDIFF(mi,GPFK_FKSJ,GPFK_FKJSSJ) as gxhs, U_WLXX_JZNAME, ");
sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_HGDJ, WOSN_KHCODE, U_WOSN_KHCODEBY1, ");
sqlMap.append(" RIGHT('0'+CAST(isnull(datepart(wk,WOSN_CJSJ),'0') as varchar(10)),2) as SNWEEK, substring(convert( nvarchar,datepart(year ,getdate())) ,3, 4) as SNYEAR, ");
sqlMap.appendCaseWhenSql("GPFK_HGDJ","hgdjname", DpGradePrintEnum.toJsonArray());
sqlMap.append(" RIGHT('0'+CAST(isnull(datepart(wk,WOSN_CJSJ),'0') as varchar(10)),2) as SNWEEK, substring(convert( nvarchar,datepart(year ,getdate())) ,3, 4) as SNYEAR ");
sqlMap.append("from GPFK ");
sqlMap.append(" left join BX on BX_ID = GPFK_FKBX ");
sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID ");
......
gavel/src/main/java/com/gavel/kwell/dao/impl/HzfklogDaoImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao.impl;
import com.gavel.common.base.dao.impl.BaseDaoImpl;
import com.gavel.common.utils.StringUtils;
import com.gavel.kwell.dao.HzfklogDao;
import com.gavel.kwell.vo.HzfklogCondition;
import com.gavel.kwell.vo.HzfklogVO;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.persistence.sql.SqlMap;
import com.gavel.persistence.sql.SqlUtil;
import org.springframework.stereotype.Repository;
@Repository("hzfklogDao")
public class HzfklogDaoImpl extends BaseDaoImpl implements HzfklogDao {
public RecordSet<HzfklogVO> query(HzfklogCondition condition){
SqlMap sqlMap = new SqlMap();
sqlMap.setPageNo(condition.getPageNo());
sqlMap.setRowCount(condition.getPageSize());
sqlMap.append("select HZFKLOG_ID, HZFKLOG_WOSNID, HZFKLOG_WLID, HZFKLOG_CZLX, HZFKLOG_WHRID, ");
sqlMap.append(" HZFKLOG_WHR, HZFKLOG_WHSJ, HZFKLOG_CJRID, HZFKLOG_CJR, HZFKLOG_CJSJ, ");
sqlMap.append(" HZFKLOG_SYSVERSION, HZFKLOG_YCZR, HZFKLOG_YCZSJ, HZFKLOG_YDJID ");
sqlMap.append("from HZFKLOG ");
sqlMap.append("where 1 = 1 ");
if (StringUtils.isNotEmpty(condition.getId())){
sqlMap.append(" and " + SqlUtil.getWhereSql("HZFKLOG_ID", condition.getId()));
sqlMap.setParamValue("HZFKLOG_ID", condition.getId());
}
sqlMap.query(HzfklogVO.class);
return sqlMap.getRecordSet();
}
}
gavel/src/main/java/com/gavel/kwell/dao/impl/UWobomDaoImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao.impl;
import com.gavel.jcsj.utils.WlsxUtils;
import com.gavel.kwell.dao.UWobomDao;
import com.gavel.kwell.vo.UWobomVO;
import org.springframework.stereotype.Repository;
import com.gavel.common.base.dao.impl.BaseDaoImpl;
import com.gavel.common.utils.StringUtils;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.persistence.sql.SqlMap;
import com.gavel.persistence.sql.SqlUtil;
import com.gavel.wo.vo.WobomCondition;
@Repository
public class UWobomDaoImpl extends BaseDaoImpl implements UWobomDao {
@Override
public RecordSet<UWobomVO> query(WobomCondition condition) {
SqlMap sqlMap = new SqlMap();
sqlMap.setPageNo(condition.getPageNo());
sqlMap.setRowCount(condition.getPageSize());
sqlMap.append("select WOBOM_ID, WOBOM_XH, WOBOM_WOID, WOBOM_WLID, WOBOM_FFGX,");
sqlMap.append(" WOBOM_DWYL, WOBOM_XQSL, WOBOM_XQRQ, WOBOM_SHL, WOBOM_SHZ, WOBOM_FFYZ,");
sqlMap.append(" WOBOM_LLSL, WOBOM_CKSL, WOBOM_BZ, WOBOM_WHRID, WOBOM_WHR,");
sqlMap.append(" WOBOM_WHSJ, WOBOM_CJRID, WOBOM_CJR, WOBOM_CJSJ, WOBOM_SYSVERSION,");
sqlMap.append(" WOBOM_DWYL, WLXX_CODE, WLXX_NAME, WLXX_GG, WOBOM_GJWL, WOBOM_ZT, ");
sqlMap.append(" SNCOUNT, BZGX_CODE, BZGX_NAME, WOBOM_WLPH ");
sqlMap.append(WlsxUtils.COMMON_SQL);
sqlMap.append("from WOBOM");
sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID");
sqlMap.append(" left join BZGX on BZGX_ID = WOBOM_FFGX ");
sqlMap.append(" left join (select count(*) as SNCOUNT, WLSN_LYDJID");
sqlMap.append(" from WLSN, WOBOM ");
sqlMap.append(" where WLSN_LYDJID = WOBOM_ID");
sqlMap.append(" and WLSN_DJLY = 'WOBOM' and WLSN_LYDJID = WOBOM_ID");
sqlMap.append(" and WOBOM_WOID = :WOBOM_WOID");
sqlMap.append(" group by WLSN_LYDJID");
sqlMap.append(" ) A on WLSN_LYDJID = WOBOM_ID");
sqlMap.append("where 1=1 ");
if (StringUtils.isNotEmpty(condition.getId())){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOBOM_ID", condition.getId()));
sqlMap.setParamValue("WOBOM_ID", condition.getId());
}
if (StringUtils.isNotEmpty(condition.getWoid())){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOBOM_WOID", condition.getWoid()));
sqlMap.setParamValue("WOBOM_WOID", condition.getWoid());
}
if (StringUtils.isNotEmpty(condition.getWlid())){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOBOM_WLID", condition.getWlid()));
sqlMap.setParamValue("WOBOM_WLID", condition.getWlid());
}
if (StringUtils.isNotEmpty(condition.getGjwl())){
sqlMap.append(" and isnull(WOBOM_GJWL,'N') = :WOBOM_GJWL ");
sqlMap.setParamValue("WOBOM_GJWL", condition.getGjwl());
}
sqlMap.setParamValue("WOBOM_WOID", condition.getWoid());
sqlMap.append("order by WOBOM_XH, WLXX_CODE ");
return sqlMap.queryRecordset(UWobomVO.class);
}
}
gavel/src/main/java/com/gavel/kwell/dao/impl/U_coderuleDaoImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao.impl;
import java.util.List;
import org.springframework.stereotype.Repository;
import com.gavel.common.base.dao.impl.BaseDaoImpl;
import com.gavel.common.business.persistent.Autoinc;
import com.gavel.common.utils.StringUtils;
import com.gavel.kwell.dao.U_coderuleDao;
import com.gavel.kwell.persistent.U_coderulemx;
import com.gavel.kwell.vo.U_coderuleCondition;
import com.gavel.kwell.vo.U_coderuleVO;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.persistence.sql.SqlMap;
import com.gavel.persistence.sql.SqlUtil;
@Repository("u_coderuleDao")
public class U_coderuleDaoImpl extends BaseDaoImpl implements U_coderuleDao {
public RecordSet<U_coderuleVO> query(U_coderuleCondition condition){
SqlMap sqlMap = new SqlMap();
sqlMap.setPageNo(condition.getPageNo());
sqlMap.setRowCount(condition.getPageSize());
sqlMap.append("select U_CODERULE_ID, U_CODERULE_CODE, U_CODERULE_NAME, U_CODERULE_BZ, ");
sqlMap.append(" U_CODERULE_WHRID, U_CODERULE_WHR, U_CODERULE_WHSJ, U_CODERULE_CJRID, U_CODERULE_CJR, ");
sqlMap.append(" U_CODERULE_CJSJ, U_CODERULE_SYSVERSION ");
sqlMap.append("from U_CODERULE ");
sqlMap.append("where 1 = 1 ");
if (StringUtils.isNotEmpty(condition.getId())){
sqlMap.append(" and " + SqlUtil.getWhereSql("U_CODERULE_ID", condition.getId()));
sqlMap.setParamValue("U_CODERULE_ID", condition.getId());
}
if (StringUtils.isNotEmpty(condition.getRuleinfo())) {
sqlMap.append(" and (U_CODERULE_CODE like :ruleinfo or U_CODERULE_NAME like :ruleinfo )");
sqlMap.setParamValueLike("ruleinfo", condition.getRuleinfo());
}
sqlMap.append("order by U_CODERULE_CODE ");
sqlMap.query(U_coderuleVO.class);
return sqlMap.getRecordSet();
}
public RecordSet<U_coderuleVO> querySn(U_coderuleCondition condition){
SqlMap sqlMap = new SqlMap();
sqlMap.setPageNo(condition.getPageNo());
sqlMap.setRowCount(condition.getPageSize());
sqlMap.append("select U_CODERULE_ID, U_CODERULE_CODE, U_CODERULE_NAME, U_CODERULE_BZ, ");
sqlMap.append(" U_CODERULE_WHRID, U_CODERULE_WHR, U_CODERULE_WHSJ, U_CODERULE_CJRID, U_CODERULE_CJR, ");
sqlMap.append(" U_CODERULE_CJSJ, U_CODERULE_SYSVERSION ");
sqlMap.append("from U_CODERULE ");
sqlMap.append("where exists( select 1 from AUTOINC ");
sqlMap.append(" where AUTOINC_FLID = (:AFLID + U_CODERULE_ID) ");
sqlMap.setParamValue("AFLID", condition.getRulefl());
sqlMap.append(" ) ");
if (StringUtils.isNotEmpty(condition.getRuleinfo())) {
sqlMap.append(" and (U_CODERULE_CODE like :ruleinfo or U_CODERULE_NAME like :ruleinfo )");
sqlMap.setParamValueLike("ruleinfo", condition.getRuleinfo());
}
sqlMap.append("order by U_CODERULE_CODE ");
sqlMap.query(U_coderuleVO.class);
return sqlMap.getRecordSet();
}
@Override
public List<U_coderulemx> queryCodeRulemx(String ruleid){
SqlMap sqlMap = new SqlMap();
sqlMap.append("select U_CODERULEMX_ID, U_CODERULEMX_MID, U_CODERULEMX_XH, U_CODERULEMX_ZLX, U_CODERULEMX_QSZ, ");
sqlMap.append(" U_CODERULEMX_GZ, U_CODERULEMX_LSHBZ, U_CODERULEMX_BZ, U_CODERULEMX_WHRID, U_CODERULEMX_WHR, ");
sqlMap.append(" U_CODERULEMX_WHSJ, U_CODERULEMX_CJRID, U_CODERULEMX_CJR, U_CODERULEMX_CJSJ, U_CODERULEMX_SYSVERSION, ");
sqlMap.append(" U_CODERULEMX_LEN ");
sqlMap.append("from U_CODERULEMX ");
sqlMap.append("where 1 = 1 ");
sqlMap.append(" and U_CODERULEMX_MID = :pMID ");
sqlMap.append("order by U_CODERULEMX_XH, U_CODERULEMX_ID ");
sqlMap.setParamValue("pMID",ruleid);
return sqlMap.query(U_coderulemx.class);
}
@Override
public RecordSet<Autoinc> autonicInfo(U_coderuleCondition condition) {
SqlMap sqlMap = new SqlMap();
sqlMap.setPageNo(condition.getPageNo());
sqlMap.setRowCount(condition.getPageSize());
sqlMap.append("select AUTOINC_FLID,AUTOINC_PREFIX, AUTOINC_VALUE ");
sqlMap.append("from AUTOINC ");
sqlMap.append("where AUTOINC_FLID = (:AFLID + :AID) ");
sqlMap.setParamValue("AFLID",condition.getRulefl());
sqlMap.setParamValue("AID",condition.getId());
sqlMap.append("order by AUTOINC_PREFIX desc ");
return sqlMap.queryRecordset(Autoinc.class);
}
}
gavel/src/main/java/com/gavel/kwell/dao/impl/U_coderulemxDaoImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.dao.impl;
import com.gavel.common.base.dao.impl.BaseDaoImpl;
import com.gavel.common.utils.StringUtils;
import com.gavel.kwell.dao.U_coderulemxDao;
import com.gavel.kwell.vo.U_coderulemxCondition;
import com.gavel.kwell.vo.U_coderulemxVO;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.persistence.sql.SqlMap;
import com.gavel.persistence.sql.SqlUtil;
import org.springframework.stereotype.Repository;
@Repository("u_coderulemxDao")
public class U_coderulemxDaoImpl extends BaseDaoImpl implements U_coderulemxDao {
public RecordSet<U_coderulemxVO> query(U_coderulemxCondition condition){
SqlMap sqlMap = new SqlMap();
sqlMap.setPageNo(condition.getPageNo());
sqlMap.setRowCount(condition.getPageSize());
sqlMap.append("select U_CODERULEMX_ID, U_CODERULEMX_MID, U_CODERULEMX_XH, U_CODERULEMX_ZLX, U_CODERULEMX_QSZ, ");
sqlMap.append(" U_CODERULEMX_GZ, U_CODERULEMX_LSHBZ, U_CODERULEMX_BZ, U_CODERULEMX_WHRID, U_CODERULEMX_WHR, ");
sqlMap.append(" U_CODERULEMX_WHSJ, U_CODERULEMX_CJRID, U_CODERULEMX_CJR, U_CODERULEMX_CJSJ, U_CODERULEMX_SYSVERSION, ");
sqlMap.append(" U_CODERULEMX_LEN ");
sqlMap.append("from U_CODERULEMX ");
sqlMap.append("where 1 = 1 ");
if (StringUtils.isNotEmpty(condition.getId())){
sqlMap.append(" and " + SqlUtil.getWhereSql("U_CODERULEMX_ID", condition.getId()));
sqlMap.setParamValue("U_CODERULEMX_ID", condition.getId());
}
if(StringUtils.isNotEmpty(condition.getMid())){
sqlMap.append(" and U_CODERULEMX_MID = :pMID ");
sqlMap.setParamValue("pMID",condition.getMid());
}
sqlMap.append("order by U_CODERULEMX_XH ");
sqlMap.query(U_coderulemxVO.class);
return sqlMap.getRecordSet();
}
}
gavel/src/main/java/com/gavel/kwell/persistent/U_coderule.java → gavel/src/main/java/com/gavel/kwell/persistent/Coderule.java
View file @ 070ba420
......@@ -9,7 +9,7 @@ import com.gavel.persistence.annotation.TableMeta;
@TableMeta(id = "U_CODERULE", name = "U_CODERULE")
public class U_coderule extends BaseEntity {
public class Coderule extends BaseEntity {
private static final long serialVersionUID = 1L;
......
gavel/src/main/java/com/gavel/kwell/persistent/U_coderulemx.java → gavel/src/main/java/com/gavel/kwell/persistent/Coderulemx.java
View file @ 070ba420
......@@ -9,7 +9,7 @@ import com.gavel.persistence.annotation.TableMeta;
@TableMeta(id = "U_CODERULEMX", name = "U_CODERULEMX")
public class U_coderulemx extends BaseEntity {
public class Coderulemx extends BaseEntity {
private static final long serialVersionUID = 1L;
......
gavel/src/main/java/com/gavel/kwell/service/GpfkhzService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import java.util.List;
import com.gavel.common.base.service.BaseEditService;
import com.gavel.gygl.vo.BzgxVO;
import com.gavel.kwell.vo.GpfkhzCondition;
import com.gavel.kwell.vo.GpfkhzVO;
public interface GpfkhzService extends BaseEditService {
public List<GpfkhzVO> queryGpfkhz(GpfkhzCondition condition);
public List<BzgxVO> listBzgxName();
}
gavel/src/main/java/com/gavel/kwell/service/GpfkschzService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import java.util.List;
import com.gavel.common.base.service.BaseEditService;
import com.gavel.gygl.vo.GzzxVO;
import com.gavel.kwell.vo.GpfkhzCondition;
import com.gavel.kwell.vo.GpfkhzVO;
public interface GpfkschzService extends BaseEditService {
public List<GpfkhzVO> queryGpfkschz(GpfkhzCondition condition);
public List<GzzxVO> listScGzzx();
}
gavel/src/main/java/com/gavel/kwell/service/HzJcsjService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import com.gavel.common.base.service.BaseService;
import com.gavel.kzzx.vo.BmVO;
import java.util.List;
public interface HzJcsjService extends BaseService {
public List<BmVO> queryJybm();
}
gavel/src/main/java/com/gavel/kwell/service/HzWlxxService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import com.gavel.jcsj.service.WlxxService;
import com.gavel.jcsj.vo.WlxxCondition;
import com.gavel.jcsj.vo.WlxxVO;
import com.gavel.persistence.sql.RecordSet;
public interface HzWlxxService extends WlxxService {
public RecordSet<WlxxVO> query(WlxxCondition condition);
public RecordSet<WlxxVO> queryWowl(WlxxCondition condition);
public RecordSet<WlxxVO> queryWlxxCskc(WlxxCondition condition);
}
gavel/src/main/java/com/gavel/kwell/service/HzfklogService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import com.gavel.common.base.service.BaseEditService;
import com.gavel.kwell.vo.HzfklogCondition;
import com.gavel.kwell.vo.HzfklogVO;
import com.gavel.persistence.sql.RecordSet;
public interface HzfklogService extends BaseEditService {
public RecordSet<HzfklogVO> query(HzfklogCondition condition);
}
gavel/src/main/java/com/gavel/kwell/service/UWobomService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import com.gavel.common.base.service.BaseEditService;
import com.gavel.kwell.persistent.Wlsn;
import com.gavel.kwell.vo.UWobomVO;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.wo.vo.WobomCondition;
import java.util.List;
public interface UWobomService extends BaseEditService {
public RecordSet<UWobomVO> query(WobomCondition condition);
public void doPlSetHgdj(List<Wlsn> wlsnList, String hgdj);
}
gavel/src/main/java/com/gavel/kwell/service/UWocxService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import com.gavel.common.base.service.BaseEditService;
import com.gavel.kwell.vo.UWoCondition;
import com.gavel.kwell.vo.UWoVO;
import com.gavel.persistence.sql.RecordSet;
public interface UWocxService extends BaseEditService {
public RecordSet<UWoVO> query(UWoCondition condition);
}
gavel/src/main/java/com/gavel/kwell/service/U_coderuleService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import java.util.List;
import com.gavel.common.base.service.BaseEditService;
import com.gavel.common.business.persistent.Autoinc;
import com.gavel.kwell.vo.CodeValueInfoVO;
import com.gavel.kwell.vo.CodeValueVO;
import com.gavel.kwell.vo.U_coderuleCondition;
import com.gavel.kwell.vo.U_coderuleVO;
import com.gavel.kwell.vo.U_coderulemxCondition;
import com.gavel.kwell.vo.U_coderulemxVO;
import com.gavel.persistence.sql.RecordSet;
public interface U_coderuleService extends BaseEditService {
public RecordSet<U_coderuleVO> query(U_coderuleCondition condition);
public RecordSet<U_coderuleVO> querySn(U_coderuleCondition condition);
public RecordSet<Autoinc> autonicInfo(U_coderuleCondition condition);
public List<CodeValueVO> getCodeValueListByCrWo(String crid, Object entity);
public void createWosn(String woid,List<CodeValueVO> codeValueVOList,int count);
public CodeValueInfoVO createOneCodeByCrId(String woid, String crId, String type);
public CodeValueInfoVO createOneCodeWithSysValue(Object sysValue, String crId, String type);
public RecordSet<U_coderulemxVO> queryDetail(U_coderulemxCondition condition);
public Integer getNowWosnValue(String woid,String type);
public Boolean setWosnValue(String woid,String type,Integer value);
public void createGjWlsn(String wlid, List<CodeValueVO> codeValueVOList, int count);
public List<CodeValueVO> getCodeValueListByCrId(String crId);
public List<CodeValueInfoVO> getSnListByCRValue(String crId, List<CodeValueVO> codeValueVOList, String type, int count);
public void createWlsn(String wlid, List<CodeValueVO> codeValueVOList, int count, String type,String djly,String lydjid,String wlph);
public boolean resetSn(String flid, String prefix,Integer value);
}
gavel/src/main/java/com/gavel/kwell/service/U_coderulemxService.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service;
import com.gavel.common.base.service.BaseEditService;
import com.gavel.kwell.vo.U_coderulemxCondition;
import com.gavel.kwell.vo.U_coderulemxVO;
import com.gavel.persistence.sql.RecordSet;
public interface U_coderulemxService extends BaseEditService {
public RecordSet<U_coderulemxVO> query(U_coderulemxCondition condition);
}
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ 070ba420
......@@ -33,7 +33,7 @@ import com.gavel.kwell.persistent.HzWosn;
import com.gavel.kwell.service.GpfkService;
import com.gavel.kwell.utils.GpfkFklxEnum;
import com.gavel.kwell.utils.HzGylxEnum;
import com.gavel.kwell.utils.HzgdParamEnum;
import com.gavel.kwell.utils.KwellParamEnum;
import com.gavel.kwell.vo.GpResVO;
import com.gavel.kwell.vo.GpWoCondition;
import com.gavel.kwell.vo.GpbhgfkCondition;
......@@ -87,7 +87,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
if(UserInfoUtil.isSuperuser()){
condition.setFkrid(null);
}
String gxids = commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_LH.getId());
String gxids = commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_LH.getId());
condition.setGxids(gxids);
return gpfkDao.queryLh(condition);
}
......@@ -191,12 +191,12 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
/**
* 连续扫描校验
*/
String lhids = commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_LH.getId());
String lhids = commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_LH.getId());
String[] lhgxs = lhids.split(",");
GpfkVO lastGpfk = gpfkDao.getLastGpfk(gpfk.getWosnid(),lhgxs);
if(lastGpfk != null){
if(!dpValid){
String allowContinueIds = commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_NGCONTINUE.getId());
String allowContinueIds = commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_NGCONTINUE.getId());
if(StringUtils.equalsIgnoreCase(gpfk.getFkgx(),lastGpfk.getFkgx()) &&
(!allowContinueIds.contains(gpfk.getFkgx()) || BooleanEnum.equalsYes(lastGpfk.getHgbz()))){
setReturnMessage("请不要连续扫描！");
......@@ -328,7 +328,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Override
public Date getGpfkYwrqByFksj(Date nowDate,String bxid){
if(StringUtils.isNotEmpty(bxid)){
boolean isYb = StringUtils.equalsIgnoreCase(commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_YBBX.getId()),bxid);
boolean isYb = StringUtils.equalsIgnoreCase(commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_YBBX.getId()),bxid);
if(isYb){
/**
* 小时小于当天12点，则业务日期归结为前一天
......@@ -468,7 +468,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
GpResVO gpResVO = new GpResVO();
gpResVO.setDcsm(BooleanEnum.NO.getId());
if(BooleanEnum.equalsYes(gpfk.getHgbz())){
String allowContinueIds = commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_NGCONTINUE.getId());
String allowContinueIds = commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_NGCONTINUE.getId());
if(allowContinueIds.contains(gpfk.getFkgx())){
int gxTimes = gpfkDao.queryGxTimes(gpfk.getFkgx(),gpfk.getWosnid());
gpResVO.setDcsm(NumberUtils.Greater(gxTimes,0)?BooleanEnum.YES.getId():BooleanEnum.NO.getId());
......@@ -524,7 +524,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
GpResVO gpResVO = new GpResVO();
gpResVO.setDcsm(BooleanEnum.NO.getId());
if(BooleanEnum.equalsYes(gpfk.getHgbz())){
String allowContinueIds = commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_NGCONTINUE.getId());
String allowContinueIds = commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_NGCONTINUE.getId());
if(allowContinueIds.contains(gpfk.getFkgx())){
int gxTimes = gpfkDao.queryGxTimes(gpfk.getFkgx(),gpfk.getWosnid());
gpResVO.setDcsm(NumberUtils.Greater(gxTimes,0)?BooleanEnum.YES.getId():BooleanEnum.NO.getId());
......@@ -627,7 +627,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Override
public List<GpfkVO> queryWosngzByWosnid(String wosnid){
String gxid = commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_LH.getId());
String gxid = commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_LH.getId());
String[] ids = gxid.split(",");
List<GpfkVO> gpfkVOList = gpfkDao.queryWosngzByWosnid(wosnid,ids);
return gpfkVOList;
......@@ -644,7 +644,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
condition.setUserid(UserInfoUtil.getId());
String userids = commonService.getStringOptionValue(GyglParamEnum.GYGL_USER_USEDGX.getId());
String[] ugxs = userids.split(",");
String lhids = commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_LH.getId());
String lhids = commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_LH.getId());
String[] lhgxs = lhids.split(",");
return gpfkDao.queryLhBzgx(condition, ugxs, lhgxs);
}
......@@ -765,7 +765,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Override
public Boolean ifNeedPrint(String gxid){
String needPrintGxs = commonService.getStringOptionValue(HzgdParamEnum.HZGD_GXLX_NEEDPRINT.getId());
String needPrintGxs = commonService.getStringOptionValue(KwellParamEnum.HZGD_GXLX_NEEDPRINT.getId());
if(StringUtils.isNotEmpty(needPrintGxs)){
return needPrintGxs.contains(gxid);
}
......
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkhzServiceImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service.impl;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.gygl.vo.BzgxVO;
import com.gavel.kwell.dao.GpfkhzDao;
import com.gavel.kwell.service.GpfkhzService;
import com.gavel.kwell.vo.GpfkhzCondition;
import com.gavel.kwell.vo.GpfkhzVO;
@Service("gpfkhzService")
@Transactional
public class GpfkhzServiceImpl extends BaseEditServiceImpl implements GpfkhzService {
@Autowired
private GpfkhzDao gpfkhzDao;
@Override
public void initService() {
}
@Override
public List<GpfkhzVO> queryGpfkhz(GpfkhzCondition condition) {
return gpfkhzDao.queryGpfkhz(condition);
}
@Override
public List<BzgxVO> listBzgxName(){
List<BzgxVO> bzgxVOList = gpfkhzDao.listBzgxByGzzxCodes(null);
BzgxVO zxGx = new BzgxVO();
zxGx.setName("装箱");
if(bzgxVOList == null){
bzgxVOList = new ArrayList<BzgxVO>();
}
bzgxVOList.add(zxGx);
return bzgxVOList;
}
}
gavel/src/main/java/com/gavel/kwell/service/impl/HzJcsjServiceImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service.impl;
import com.gavel.common.base.service.impl.BaseServiceImpl;
import com.gavel.common.business.service.CommonService;
import com.gavel.jcsj.dao.JcsjDao;
import com.gavel.kwell.service.HzJcsjService;
import com.gavel.kwell.utils.HzgdParamEnum;
import com.gavel.kzzx.vo.BmVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service("hzJcsjService")
@Transactional
public class HzJcsjServiceImpl extends BaseServiceImpl implements HzJcsjService {
@Autowired
private JcsjDao jcsjDao;
@Autowired
private CommonService commonService;
@Override
public List<BmVO> queryJybm() {
String bmid = commonService.getStringOptionValue(HzgdParamEnum.HZGD_JYJL_JYBM.getId());
String[] ids = bmid.split(",");
return jcsjDao.queryBm(ids);
}
}
gavel/src/main/java/com/gavel/kwell/service/impl/HzfklogServiceImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service.impl;
import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.kwell.dao.HzfklogDao;
import com.gavel.kwell.persistent.Hzfklog;
import com.gavel.kwell.service.HzfklogService;
import com.gavel.kwell.vo.HzfklogCondition;
import com.gavel.kwell.vo.HzfklogVO;
import com.gavel.persistence.sql.RecordSet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service("hzfklogService")
@Transactional
public class HzfklogServiceImpl extends BaseEditServiceImpl implements HzfklogService {
@Autowired
private HzfklogDao hzfklogDao;
@Override
public void initService() {
addMaster( Hzfklog.class);
}
@Override
public RecordSet<HzfklogVO> query(HzfklogCondition condition) {
return hzfklogDao.query(condition);
}
}
gavel/src/main/java/com/gavel/kwell/service/impl/UWobomServiceImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service.impl;
import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.kwell.dao.UWobomDao;
import com.gavel.kwell.persistent.Wlsn;
import com.gavel.kwell.service.UWobomService;
import com.gavel.kwell.vo.UWobomVO;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.wo.vo.WobomCondition;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class UWobomServiceImpl extends BaseEditServiceImpl implements UWobomService {
@Autowired
private UWobomDao uwobomDao;
@Override
public void initService() {
// TODO Auto-generated method stub
}
@Override
public RecordSet<UWobomVO> query(WobomCondition condition) {
return uwobomDao.query(condition);
}
@Override
public void doPlSetHgdj(List<Wlsn> wlsnList, String hgdj){
if(wlsnList != null && wlsnList.size() > 0){
for(Wlsn wlsn:wlsnList){
wlsn.setHgdj(hgdj);
}
uwobomDao.batchUpdateByUser(wlsnList);
}
}
}
gavel/src/main/java/com/gavel/kwell/service/impl/UWocxServiceImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service.impl;
import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.kwell.dao.UWoDao;
import com.gavel.kwell.service.UWocxService;
import com.gavel.kwell.vo.UWoCondition;
import com.gavel.kwell.vo.UWoVO;
import com.gavel.persistence.sql.RecordSet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service("wocxService")
@Transactional
public class UWocxServiceImpl extends BaseEditServiceImpl implements UWocxService {
@Autowired
private UWoDao uwoDao;
@Override
public void initService() {
}
@Override
public RecordSet<UWoVO> query(UWoCondition condition) {
return uwoDao.query(condition);
}
}
gavel/src/main/java/com/gavel/kwell/service/impl/U_coderulemxServiceImpl.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.service.impl;
import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.kwell.dao.U_coderulemxDao;
import com.gavel.kwell.persistent.U_coderulemx;
import com.gavel.kwell.service.U_coderulemxService;
import com.gavel.kwell.vo.U_coderulemxCondition;
import com.gavel.kwell.vo.U_coderulemxVO;
import com.gavel.persistence.sql.RecordSet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service("u_coderulemxService")
@Transactional
public class U_coderulemxServiceImpl extends BaseEditServiceImpl implements U_coderulemxService {
@Autowired
private U_coderulemxDao u_coderulemxDao;
@Override
public void initService() {
addMaster( U_coderulemx.class);
}
@Override
public RecordSet<U_coderulemxVO> query(U_coderulemxCondition condition) {
return u_coderulemxDao.query(condition);
}
}
gavel/src/main/java/com/gavel/kwell/utils/CRConstants.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
/*
* @Author youjian.ding
* @Date $
**/
public class CRConstants {
public static final String CR_FILL = "0";
public static final char[] CRYearDTypeChar = {
'0', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
'X', 'Y', 'Z'};
public static final int CRYearDTypeBegin = 2020;
public static final char[] CRMonthATypeChar = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C'};
public static final char[] CRMonthBTypeChar = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'X', 'Y', 'Z'};
public static final char[] CRDayATypeChar = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P',
'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X'};
public static final char[] CRDayBTypeChar = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P',
'R', 'S', 'T', 'V', 'W', 'X', 'Y', 'Z'};
public static final char[] CRBIT32ATypeChar = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P',
'R', 'S', 'T', 'V', 'W', 'X', 'Y', 'Z'};
}
gavel/src/main/java/com/gavel/kwell/utils/CRDayEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum CRDayEnum {
A("A","1-9日：1-9；10-31日：A/B/C……V/W/X(避开I/O)"),
B("B","1-9日：1-9；10-31日：A/B/C……V/W/X(避开I/O/Q/U)");
private String id;
private String name;
CRDayEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (CRDayEnum e : CRDayEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public static JSONArray toJsonArray() {
JSONArray jsonArray = new JSONArray();
for (CRDayEnum e : CRDayEnum.values()) {
JSONObject object = new JSONObject();
object.put("id", e.getId());
object.put("name", e.getName());
jsonArray.add(object);
}
return jsonArray;
}
}
gavel/src/main/java/com/gavel/kwell/utils/CRMonthEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum CRMonthEnum {
A("A","1-9月：1-9；10-12月：A/B/C"),
B("B","1-9月：1-9；10-12月：X/Y/Z"),
C("C","数字型月份");
private String id;
private String name;
CRMonthEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (CRMonthEnum e : CRMonthEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public static JSONArray toJsonArray() {
JSONArray jsonArray = new JSONArray();
for (CRMonthEnum e : CRMonthEnum.values()) {
JSONObject object = new JSONObject();
object.put("id", e.getId());
object.put("name", e.getName());
jsonArray.add(object);
}
return jsonArray;
}
}
gavel/src/main/java/com/gavel/kwell/utils/CRSnEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum CRSnEnum {
DEC("DEC","十进制"),
HEX("HEX","十六进制"),
BIT32B("BIT32B","三十二进制(去除IOQU)");
private String id;
private String name;
CRSnEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (CRSnEnum e : CRSnEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public static JSONArray toJsonArray() {
JSONArray jsonArray = new JSONArray();
for (CRSnEnum e : CRSnEnum.values()) {
JSONObject object = new JSONObject();
object.put("id", e.getId());
object.put("name", e.getName());
jsonArray.add(object);
}
return jsonArray;
}
}
gavel/src/main/java/com/gavel/kwell/utils/CRSysEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum CRSysEnum {
BM("BM","部门编码"),
DDSL("DDSL","订单数量"),
HGDJ("HGDJ","合格等级"),
WLPH("WLPH", "批号");
private String id;
private String name;
CRSysEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (CRSysEnum e : CRSysEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public static JSONArray toJsonArray() {
JSONArray jsonArray = new JSONArray();
for (CRSysEnum e : CRSysEnum.values()) {
JSONObject object = new JSONObject();
object.put("id", e.getId());
object.put("name", e.getName());
jsonArray.add(object);
}
return jsonArray;
}
}
gavel/src/main/java/com/gavel/kwell/utils/CRTableTypeEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum CRTableTypeEnum {
WOSN("WOSN","产品序列号"),
KHSN("KHSN","客户序列号"),
KHB1SN("KHB1SN","客户序列号2"),
ZXSN("ZXSN","装箱序列号"),
ZTSN("ZTSN","装托序列号"),
GJSN("GJSN","工具序列号"),
DHWL("DHWL","到货物料序列号"),
BZSN("BZSN","包装序列号");
private String id;
private String name;
CRTableTypeEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (CRTableTypeEnum e : CRTableTypeEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/CRTypeEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum CRTypeEnum {
YEAR("Y","年度",CRYearEnum.toJsonArray()),
MONTH("M","月份",CRMonthEnum.toJsonArray()),
DAY("D","日期",CRDayEnum.toJsonArray()),
WEEK("W","周",CRWeekEnum.toJsonArray()),
SYS("S","系统编码",CRSysEnum.toJsonArray()),
INPUT("I","输入值",new JSONArray()),
FIXVALUE("F","固定值",new JSONArray()),
SN("N","流水号",CRSnEnum.toJsonArray());
private String id;
private String name;
private JSONArray detail;
CRTypeEnum(String id, String name,JSONArray detail){
this.id = id;
this.name = name;
this.detail = detail;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public JSONArray getDetail() {
return detail;
}
public void setDetail(JSONArray detail) {
this.detail = detail;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (CRTypeEnum e : CRTypeEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public static JSONArray toJsonArray() {
JSONArray jsonArray = new JSONArray();
for (CRTypeEnum e : CRTypeEnum.values()) {
JSONObject object = new JSONObject();
object.put("id", e.getId());
object.put("name", e.getName());
object.put("detail",e.getDetail());
jsonArray.add(object);
}
return jsonArray;
}
}
gavel/src/main/java/com/gavel/kwell/utils/CRWeekEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum CRWeekEnum {
A("A","当前周（数字显示）");
private String id;
private String name;
CRWeekEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (CRWeekEnum e : CRWeekEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public static JSONArray toJsonArray() {
JSONArray jsonArray = new JSONArray();
for (CRWeekEnum e : CRWeekEnum.values()) {
JSONObject object = new JSONObject();
object.put("id", e.getId());
object.put("name", e.getName());
jsonArray.add(object);
}
return jsonArray;
}
}
gavel/src/main/java/com/gavel/kwell/utils/CRYearEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gavel.kzzx.model.GavelEnumModel;
public enum CRYearEnum {
A("A","年份最后一位"),
B("B","年份后两位"),
C("C","四位年份"),
D("D","0(2020),A(2021),B(2022)…");
private String id;
private String name;
CRYearEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (CRYearEnum e : CRYearEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public static JSONArray toJsonArray() {
JSONArray jsonArray = new JSONArray();
for (CRYearEnum e : CRYearEnum.values()) {
JSONObject object = new JSONObject();
object.put("id", e.getId());
object.put("name", e.getName());
jsonArray.add(object);
}
return jsonArray;
}
}
gavel/src/main/java/com/gavel/kwell/utils/DpGradeEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum DpGradeEnum {
AN("AN","AN"),///默认AN
A0("A0","A0"),
// A0AN("A0升AN","A0升AN"),
// ANA0("AN降A0","AN降A0"),
AS("AS","AS"),
// AL("AL","AL"),
// B0("B0","B0"),
// C0("C0","C0");
AC("AC","AC"),
AR("AR","AR");
private String id;
private String name;
DpGradeEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (DpGradeEnum e : DpGradeEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/DpGradePrintEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum DpGradePrintEnum {
AN("AN","N"),///默认AN
A0("A0","0"),
// A0AN("A0升AN","A0升AN"),
// ANA0("AN降A0","AN降A0"),
AS("AS","S"),
AC("AC","C"),
AR("AR","R");
private String id;
private String name;
DpGradePrintEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static String getValue(String key) {
for (DpGradePrintEnum e : DpGradePrintEnum.values()) {
if(e.getId().equalsIgnoreCase(key)){
return e.getName();
}
}
return "";
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (DpGradePrintEnum e : DpGradePrintEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public static JSONArray toJsonArray() {
JSONArray jsonArray = new JSONArray();
for (DpGradePrintEnum e : DpGradePrintEnum.values()) {
JSONObject object = new JSONObject();
object.put("id", e.getId());
object.put("name", e.getName());
jsonArray.add(object);
}
return jsonArray;
}
}
gavel/src/main/java/com/gavel/kwell/utils/GJwlFzEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum GJwlFzEnum {
ALL(" ", "所有"),
YES("Y","是"),
NO("N","否");
private String id;
private String name;
GJwlFzEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (GJwlFzEnum e : GJwlFzEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/GpbhglxEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum GpbhglxEnum {
FX("返修", "FX"),
GF("工废", "GF"),
LF("料废","LF"),
FG("返工","FG");
private String id; //数据库存储
private String name;
GpbhglxEnum(String name, String id) {
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (GpbhglxEnum e : GpbhglxEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/GpfkbgzlhzEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum GpfkbgzlhzEnum {
GZZX("GZZX", "工作中心"),
WL("WL", "物料");
private String id;
private String name;
GpfkbgzlhzEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (GpfkbgzlhzEnum e : GpfkbgzlhzEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/GpfkhzEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum GpfkhzEnum {
GZZX("GZZX", "工作中心"),
GX("GX","工序"),
WL("WL", "物料"),
FKR("FKR","反馈人");
private String id;
private String name;
GpfkhzEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (GpfkhzEnum e : GpfkhzEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/GzzxTypeEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum GzzxTypeEnum {
BG("BG", "背光","N%"),
DP("DP","大屏","S%");
private String id;
private String name;
private String code;
GzzxTypeEnum(String id, String name, String code){
this.id = id;
this.name = name;
this.code = code;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (GzzxTypeEnum e : GzzxTypeEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
gavel/src/main/java/com/gavel/kwell/utils/HzGzzxTlgxEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum HzGzzxTlgxEnum {
N1("N1","TL01"),
N2("N2","TL02"),
N3("N3","TL03"),
N4("N4","TL07"),
S1("S1","GJ02"),
S2("S2","GJ08");
private String gzzx;
private String jycode;
HzGzzxTlgxEnum(String gzzx, String jycode){
this.gzzx = gzzx;
this.jycode = jycode;
}
public String getGzzx() {
return gzzx;
}
public void setGzzx(String gzzx) {
this.gzzx = gzzx;
}
public String getJycode() {
return jycode;
}
public void setJycode(String jycode) {
this.jycode = jycode;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (HzGzzxTlgxEnum e : HzGzzxTlgxEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getGzzx());
gavelEnumModel.setName(e.getJycode());
list.add(gavelEnumModel);
}
return list;
}
public static String[] getScGzzxStrings(){
String[] bglpGzzxStrings = new String[HzGzzxTlgxEnum.values().length];
for(int i = 0; i< HzGzzxTlgxEnum.values().length; i++){
bglpGzzxStrings[i] = HzGzzxTlgxEnum.values()[i].gzzx;
}
return bglpGzzxStrings;
}
public static String[] getScTlcodeStrings(){
String[] bglpJygxStrings = new String[HzGzzxTlgxEnum.values().length];
for(int i = 0; i< HzGzzxTlgxEnum.values().length; i++){
bglpJygxStrings[i] = HzGzzxTlgxEnum.values()[i].jycode;
}
return bglpJygxStrings;
}
}
gavel/src/main/java/com/gavel/kwell/utils/JhbgStateEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum JhbgStateEnum {
Initial("I","初始"),
Confirmd("C","确认");
private String id;
private String name;
JhbgStateEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList(){
List<GavelEnumModel> list = new ArrayList<>();
for (JhbgStateEnum e : JhbgStateEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/HzgdParamEnum.java → gavel/src/main/java/com/gavel/kwell/utils/KwellParamEnum.java
View file @ 070ba420
......@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.List;
@GavelParams("901000000")
public enum HzgdParamEnum {
public enum KwellParamEnum {
HZGD_JYJL_JYBM("HZGDU001", "用户可操作的检验部门", "U", "用户可操作的检验部门", "E", "select BM_ID as ID, BM_CODE as CODE, BM_NAME as NAME from BM where isnull(BM_TYBZ,'N')='N' order by BM_CODE", "", ""),
HZGD_GXLX_LH("HZGDB001", "设置标准工序为老化工序", "B", "设置标准工序为老化工序", "E",
......@@ -79,21 +79,21 @@ public enum HzgdParamEnum {
private String qsz; // 缺省值
private String qszsm; //缺省值说明
HzgdParamEnum(String id, String name, String type, String desc) {
KwellParamEnum(String id, String name, String type, String desc) {
this.id = id;
this.name = name;
this.type = type;
this.desc = desc;
}
HzgdParamEnum(String id, String name, String type, String desc, String zlx) {
KwellParamEnum(String id, String name, String type, String desc, String zlx) {
this.id = id;
this.name = name;
this.type = type;
this.desc = desc;
this.zlx = zlx;
}
HzgdParamEnum(String id, String name, String type, String desc, String zlx, String qsz) {
KwellParamEnum(String id, String name, String type, String desc, String zlx, String qsz) {
this.id = id;
this.name = name;
this.type = type;
......@@ -104,7 +104,7 @@ public enum HzgdParamEnum {
}
HzgdParamEnum(String id, String name, String type, String desc, String zlx, String qsz, String qszsm) {
KwellParamEnum(String id, String name, String type, String desc, String zlx, String qsz, String qszsm) {
this.id = id;
this.name = name;
this.type = type;
......@@ -114,7 +114,7 @@ public enum HzgdParamEnum {
this.qszsm = qszsm;
}
HzgdParamEnum(String id, String name, String type, String desc, String zlx, String zy, String qsz, String qszsm) {
KwellParamEnum(String id, String name, String type, String desc, String zlx, String zy, String qsz, String qszsm) {
this.id = id;
this.name = name;
this.type = type;
......@@ -199,7 +199,7 @@ public enum HzgdParamEnum {
public static List<ModuleParams> toList(){
List<ModuleParams> list = new ArrayList<>();
for (HzgdParamEnum e : values()) {
for (KwellParamEnum e : values()) {
ModuleParams moduleParams = new ModuleParams();
moduleParams.setCsid(e.getId());
moduleParams.setCsmc(e.getName());
......
gavel/src/main/java/com/gavel/kwell/utils/MacPatternEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum MacPatternEnum {
Pa1("Pa1", "/^[A-Fa-f0-9]{2}([-:]?[A-Fa-f0-9]{2})([-:.]?[A-Fa-f0-9]{2})([-:]?[A-Fa-f0-9]{2})([-:.]?[A-Fa-f0-9]{2})([-:]?[A-Fa-f0-9]{2})$"),
Pa2("Pa2","/^[A-Fa-f0-9]{2}(-[A-Fa-f0-9]{2}){5}$|^[A-Fa-f0-9]{2}(:[A-Fa-f0-9]{2}){5}$|^[A-Fa-f0-9]{12}$|^[A-Fa-f0-9]{4}(\\.[A-Fa-f0-9]{4}){2}$");
private String id;
private String name;
MacPatternEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (MacPatternEnum e : MacPatternEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/MzPatternEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum MzPatternEnum {
Pa1("Pa1", "^[Zz].*$");
private String id;
private String name;
MzPatternEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (MzPatternEnum e : MzPatternEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/PcjhStateEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum PcjhStateEnum {
Initial("I","初始"),
Confirm("F","确认");
private String id;
private String name;
PcjhStateEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (PcjhStateEnum e : PcjhStateEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/SnHoldLyEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum SnHoldLyEnum {
WO("WO", "任务单"),
PH("PH","批号"),
ZX("ZX","装箱"),
SN("SN","条码"),
KCCX("KCCX","库存超限");
private String id;
private String name;
SnHoldLyEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (SnHoldLyEnum e : SnHoldLyEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/utils/SnHoldStateEnum.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.utils;
import com.gavel.kzzx.model.GavelEnumModel;
import java.util.ArrayList;
import java.util.List;
public enum SnHoldStateEnum {
HOLD("H", "锁定"),
UNHOLD("U","解锁");
private String id;
private String name;
SnHoldStateEnum(String id, String name){
this.id = id;
this.name = name;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<GavelEnumModel> toList() {
List<GavelEnumModel> list = new ArrayList<>();
for (SnHoldStateEnum e : SnHoldStateEnum.values()) {
GavelEnumModel gavelEnumModel = new GavelEnumModel();
gavelEnumModel.setId(e.getId());
gavelEnumModel.setName(e.getName());
list.add(gavelEnumModel);
}
return list;
}
}
gavel/src/main/java/com/gavel/kwell/vo/GpfkcxVO.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.kwell.persistent.Gpfk;
import com.gavel.persistence.annotation.FieldMeta;
public class GpfkcxVO extends Gpfk {
private static final long serialVersionUID = 3877646077533972481L;
@FieldMeta(fieldName = "WOSN_CODE", caption = "序列号")
private String wosnCode;
@FieldMeta(fieldName = "BZGX_CODE", caption = "工序编码")
private String bzgxCode;
@FieldMeta(fieldName = "BZGX_NAME", caption = "工序名称")
private String bzgxName;
@FieldMeta(fieldName = "GZZX_CODE", caption = "工作中心")
private String gzzxCode;
@FieldMeta(fieldName = "GZZX_NAME", caption = "工作中心")
private String gzzxName;
@FieldMeta(fieldName = "WLXX_CODE", caption = "物料编码")
private String wlxxCode;
@FieldMeta(fieldName = "WLXX_NAME", caption = "物料名称")
private String wlxxName;
@FieldMeta(fieldName = "WLXX_GG", caption = "规格")
private String wlxxGg;
@FieldMeta(fieldName = "WO_DJID", caption = "任务单号")
private String woDjid;
@FieldMeta(fieldName = "WOGYLX_XQSL", caption = "订单数量")
private Integer xqsl;
@FieldMeta(fieldName = "GXHS",caption = "工序耗时")
private Double gxhs;
@FieldMeta(fieldName = "U_WLXX_JZNAME", caption = "机种名称" )
private String jzname;
@FieldMeta(fieldName = "BX_NAME", caption = "班型")
private String bxName;
@FieldMeta(fieldName = "BHGXX_NAME", caption = "不合格现象名称")
private String bhgxxName;
@FieldMeta(fieldName = "BHGYY_NAME", caption = "不合格原因名称")
private String bhgyyName;
//计划字段
@FieldMeta(fieldName = "ZYJH_DJID", caption = "作业计划号")
private String zyjhDjid;
@FieldMeta(fieldName = "ZYJHMX_JHRQ", caption = "计划日期")
private String zyjhmxJhrq;
@FieldMeta(fieldName = "WOGYLX_XH", caption = "工艺路线序号")
private Integer wogylxXh;
@FieldMeta(fieldName = "ZYJHMX_JHSL", caption = "计划数量")
private Integer jhsl;
@FieldMeta(fieldName = "SCXY",caption = "生产效益")
private Double scxy;
public String getWosnCode() {
return wosnCode;
}
public void setWosnCode(String wosnCode) {
this.wosnCode = wosnCode;
}
public String getBzgxCode() {
return bzgxCode;
}
public void setBzgxCode(String bzgxCode) {
this.bzgxCode = bzgxCode;
}
public String getBzgxName() {
return bzgxName;
}
public void setBzgxName(String bzgxName) {
this.bzgxName = bzgxName;
}
public String getGzzxCode() {
return gzzxCode;
}
public void setGzzxCode(String gzzxCode) {
this.gzzxCode = gzzxCode;
}
public String getGzzxName() {
return gzzxName;
}
public void setGzzxName(String gzzxName) {
this.gzzxName = gzzxName;
}
public String getWlxxCode() {
return wlxxCode;
}
public void setWlxxCode(String wlxxCode) {
this.wlxxCode = wlxxCode;
}
public String getWlxxName() {
return wlxxName;
}
public void setWlxxName(String wlxxName) {
this.wlxxName = wlxxName;
}
public String getWlxxGg() {
return wlxxGg;
}
public void setWlxxGg(String wlxxGg) {
this.wlxxGg = wlxxGg;
}
public String getWoDjid() {
return woDjid;
}
public void setWoDjid(String woDjid) {
this.woDjid = woDjid;
}
public Integer getXqsl() {
return xqsl;
}
public void setXqsl(Integer xqsl) {
this.xqsl = xqsl;
}
public Double getGxhs() {
return gxhs;
}
public void setGxhs(Double gxhs) {
this.gxhs = gxhs;
}
public String getJzname() {
return jzname;
}
public void setJzname(String jzname) {
this.jzname = jzname;
}
public String getBxName() {
return bxName;
}
public void setBxName(String bxName) {
this.bxName = bxName;
}
public String getBhgxxName() {
return bhgxxName;
}
public void setBhgxxName(String bhgxxName) {
this.bhgxxName = bhgxxName;
}
public String getBhgyyName() {
return bhgyyName;
}
public void setBhgyyName(String bhgyyName) {
this.bhgyyName = bhgyyName;
}
public String getZyjhDjid() {
return zyjhDjid;
}
public void setZyjhDjid(String zyjhDjid) {
this.zyjhDjid = zyjhDjid;
}
public String getZyjhmxJhrq() {
return zyjhmxJhrq;
}
public void setZyjhmxJhrq(String zyjhmxJhrq) {
this.zyjhmxJhrq = zyjhmxJhrq;
}
public Integer getWogylxXh() {
return wogylxXh;
}
public void setWogylxXh(Integer wogylxXh) {
this.wogylxXh = wogylxXh;
}
public Integer getJhsl() {
return jhsl;
}
public void setJhsl(Integer jhsl) {
this.jhsl = jhsl;
}
public Double getScxy() {
return scxy;
}
public void setScxy(Double scxy) {
this.scxy = scxy;
}
}
gavel/src/main/java/com/gavel/kwell/vo/GpfkhzCondition.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.common.base.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
public class GpfkhzCondition extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "反馈人ID")
private String fkrid;
@ApiModelProperty(value = "反馈人")
private String fkr;
@ApiModelProperty(value = "工序")
private String gxid;
@ApiModelProperty(value = "工序名称")
private String gxname;
@ApiModelProperty(value = "工作中心")
private String gzzxid;
@ApiModelProperty(value = "反馈时间始")
private Date start;
@ApiModelProperty(value = "反馈时间止")
private Date end;
@ApiModelProperty(value = "物料")
private String wlid;
@ApiModelProperty(value = "汇总方式")
private String hzfs;
@ApiModelProperty(value = "机种")
private String jzname;
private String[] gzzxStrings;
private String[] matchGxStrings;
private String gzzxIdList;
/**
* 工作中心出现多个需要匹配的工序参数时，
* 该参数作为检验工序
*/
private String[] matchJyGxStrings;
public String getFkrid() {
return fkrid;
}
public void setFkrid(String fkrid) {
this.fkrid = fkrid;
}
public String getFkr() {
return fkr;
}
public void setFkr(String fkr) {
this.fkr = fkr;
}
public String getGxid() {
return gxid;
}
public void setGxid(String gxid) {
this.gxid = gxid;
}
public String getGzzxid() {
return gzzxid;
}
public void setGzzxid(String gzzxid) {
this.gzzxid = gzzxid;
}
public Date getStart() {
return start;
}
public void setStart(Date start) {
this.start = start;
}
public Date getEnd() {
return end;
}
public void setEnd(Date end) {
this.end = end;
}
public String getWlid() {
return wlid;
}
public void setWlid(String wlid) {
this.wlid = wlid;
}
public String getHzfs() {
return hzfs;
}
public void setHzfs(String hzfs) {
this.hzfs = hzfs;
}
public String getJzname() {
return jzname;
}
public void setJzname(String jzname) {
this.jzname = jzname;
}
public String[] getGzzxStrings() {
return gzzxStrings;
}
public void setGzzxStrings(String[] gzzxStrings) {
this.gzzxStrings = gzzxStrings;
}
public String[] getMatchGxStrings() {
return matchGxStrings;
}
public void setMatchGxStrings(String[] matchGxStrings) {
this.matchGxStrings = matchGxStrings;
}
public String getGxname() {
return gxname;
}
public void setGxname(String gxname) {
this.gxname = gxname;
}
public String[] getMatchJyGxStrings() {
return matchJyGxStrings;
}
public void setMatchJyGxStrings(String[] matchJyGxStrings) {
this.matchJyGxStrings = matchJyGxStrings;
}
public String getGzzxIdList() {
return gzzxIdList;
}
public void setGzzxIdList(String gzzxIdList) {
this.gzzxIdList = gzzxIdList;
}
}
gavel/src/main/java/com/gavel/kwell/vo/GpfkhzVO.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.common.base.entity.BaseEntity;
import com.gavel.persistence.annotation.FieldMeta;
import java.util.Date;
public class GpfkhzVO extends BaseEntity {
private static final long serialVersionUID = 8533157621444610854L;
@FieldMeta(fieldName = "BZGX_ID", caption = "工序ID")
private String bzgxId;
@FieldMeta(fieldName = "BZGX_CODE", caption = "工序编码")
private String bzgxCode;
@FieldMeta(fieldName = "BZGX_NAME", caption = "工序名称")
private String bzgxName;
@FieldMeta(fieldName = "GZZX_ID", caption = "工作中心ID")
private String gzzxId;
@FieldMeta(fieldName = "GZZX_CODE", caption = "工作中心")
private String gzzxCode;
@FieldMeta(fieldName = "GZZX_NAME", caption = "工作中心名称")
private String gzzxName;
@FieldMeta(fieldName = "WLXX_CODE", caption = "物料编码")
private String wlxxCode;
@FieldMeta(fieldName = "WLXX_ID", caption = "物料信息ID")
private String wlxxId;
@FieldMeta(fieldName = "WLXX_GG", caption = "物料规格")
private String wlxxGg;
@FieldMeta(fieldName = "WLXX_NAME", caption = "物料名称")
private String wlxxName;
@FieldMeta(fieldName = "U_WLXX_JZNAME", caption = "机种" )
private String jzname;
@FieldMeta(fieldName = "USERS_USERID", caption = "用户编码" )
private String userid;
@FieldMeta(fieldName = "USERS_USERNAME", caption = "用户名称" )
private String username;
@FieldMeta(fieldName = "GPFK_HGSL", caption = "合格数量" )
private Double hgsl;
@FieldMeta(fieldName = "GPFK_BHGSL", caption = "不合格数量" )
private Double bhgsl;
@FieldMeta(fieldName = "GPFK_FKSL", caption = "反馈数量" )
private Double fksl;
@FieldMeta(fieldName = "BHGL", caption = "不合格率" )
private Double bhgl;
@FieldMeta(fieldName = "WGSL", caption = "完工数量" )
private Double wgsl;
@FieldMeta(fieldName = "HGL", caption = "合格率" )
private Double hgl;
@FieldMeta(fieldName = "WLINFO", caption = "物料查询信息" )
private String wlinfo;
@FieldMeta(fieldName = "startDate", caption = "开始时间" )
private Date startDate;
@FieldMeta(fieldName = "endDate", caption = "结束时间" )
private Date endDate;
public String getBzgxCode() {
return bzgxCode;
}
public void setBzgxCode(String bzgxCode) {
this.bzgxCode = bzgxCode;
}
public String getBzgxName() {
return bzgxName;
}
public void setBzgxName(String bzgxName) {
this.bzgxName = bzgxName;
}
public String getGzzxCode() {
return gzzxCode;
}
public void setGzzxCode(String gzzxCode) {
this.gzzxCode = gzzxCode;
}
public String getGzzxName() {
return gzzxName;
}
public void setGzzxName(String gzzxName) {
this.gzzxName = gzzxName;
}
public String getWlxxCode() {
return wlxxCode;
}
public void setWlxxCode(String wlxxCode) {
this.wlxxCode = wlxxCode;
}
public String getWlxxName() {
return wlxxName;
}
public void setWlxxName(String wlxxName) {
this.wlxxName = wlxxName;
}
public String getJzname() {
return jzname;
}
public void setJzname(String jzname) {
this.jzname = jzname;
}
public String getUserid() {
return userid;
}
public void setUserid(String userid) {
this.userid = userid;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public Double getHgsl() {
return hgsl;
}
public void setHgsl(Double hgsl) {
this.hgsl = hgsl;
}
public Double getBhgsl() {
return bhgsl;
}
public void setBhgsl(Double bhgsl) {
this.bhgsl = bhgsl;
}
public Double getFksl() {
return fksl;
}
public void setFksl(Double fksl) {
this.fksl = fksl;
}
public Double getBhgl() {
return bhgl;
}
public void setBhgl(Double bhgl) {
this.bhgl = bhgl;
}
public String getWlxxGg() {
return wlxxGg;
}
public void setWlxxGg(String wlxxGg) {
this.wlxxGg = wlxxGg;
}
public Double getWgsl() {
return wgsl;
}
public void setWgsl(Double wgsl) {
this.wgsl = wgsl;
}
public Double getHgl() {
return hgl;
}
public void setHgl(Double hgl) {
this.hgl = hgl;
}
public String getBzgxId() {
return bzgxId;
}
public void setBzgxId(String bzgxId) {
this.bzgxId = bzgxId;
}
public String getGzzxId() {
return gzzxId;
}
public void setGzzxId(String gzzxId) {
this.gzzxId = gzzxId;
}
public Date getStartDate() {
return startDate;
}
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
public Date getEndDate() {
return endDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public String getWlxxId() {
return wlxxId;
}
public void setWlxxId(String wlxxId) {
this.wlxxId = wlxxId;
}
public String getWlinfo() {
return wlinfo;
}
public void setWlinfo(String wlinfo) {
this.wlinfo = wlinfo;
}
}
gavel/src/main/java/com/gavel/kwell/vo/HzKcswCondition.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.common.base.entity.BaseEntity;
import java.util.Date;
public class HzKcswCondition extends BaseEntity {
/**
*
*/
private static final long serialVersionUID = 1L;
private String swlx;
private Date start;
private Date end;
private String wlid;
private String wlph;
private String kwid;
private String ckid;
private String[] swlxids;
private String xsfs;
private String sninfo;
private String bmid;
private String jzname;
private String[] ckids;
private String wlxx;
private String phxx;
private Date kjqjksrq;
private String kcdjid;
private String hzfs;
private String aqkc;//安全库存
private String boxid;
public String getSwlx() {
return swlx;
}
public void setSwlx(String swlx) {
this.swlx = swlx;
}
public Date getStart() {
return start;
}
public void setStart(Date start) {
this.start = start;
}
public Date getEnd() {
return end;
}
public void setEnd(Date end) {
this.end = end;
}
public String getWlid() {
return wlid;
}
public void setWlid(String wlid) {
this.wlid = wlid;
}
public String getWlph() {
return wlph;
}
public void setWlph(String wlph) {
this.wlph = wlph;
}
public String getKwid() {
return kwid;
}
public void setKwid(String kwid) {
this.kwid = kwid;
}
public String getCkid() {
return ckid;
}
public void setCkid(String ckid) {
this.ckid = ckid;
}
public String[] getSwlxids() {
return swlxids;
}
public void setSwlxids(String[] swlxids) {
this.swlxids = swlxids;
}
public String getXsfs() {
return xsfs;
}
public void setXsfs(String xsfs) {
this.xsfs = xsfs;
}
public String getSninfo() {
return sninfo;
}
public void setSninfo(String sninfo) {
this.sninfo = sninfo;
}
public String getBmid() {
return bmid;
}
public void setBmid(String bmid) {
this.bmid = bmid;
}
public String getJzname() {
return jzname;
}
public void setJzname(String jzname) {
this.jzname = jzname;
}
public String[] getCkids() {
return ckids;
}
public void setCkids(String[] ckids) {
this.ckids = ckids;
}
public String getWlxx() {
return wlxx;
}
public void setWlxx(String wlxx) {
this.wlxx = wlxx;
}
public String getPhxx() {
return phxx;
}
public void setPhxx(String phxx) {
this.phxx = phxx;
}
public Date getKjqjksrq() {
return kjqjksrq;
}
public void setKjqjksrq(Date kjqjksrq) {
this.kjqjksrq = kjqjksrq;
}
public String getKcdjid() {
return kcdjid;
}
public void setKcdjid(String kcdjid) {
this.kcdjid = kcdjid;
}
public String getHzfs() {
return hzfs;
}
public void setHzfs(String hzfs) {
this.hzfs = hzfs;
}
public String getAqkc() {
return aqkc;
}
public void setAqkc(String aqkc) {
this.aqkc = aqkc;
}
public String getBoxid() {
return boxid;
}
public void setBoxid(String boxid) {
this.boxid = boxid;
}
}
gavel/src/main/java/com/gavel/kwell/vo/HzKcswVO.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.kc.persistent.Kcsw;
import com.gavel.persistence.annotation.FieldMeta;
import java.util.Date;
public class HzKcswVO extends Kcsw {
private static final long serialVersionUID = -804620674042099358L;
/**
*
*/
//KcswVO
@FieldMeta(fieldName = "WLXX_GG", caption = "规格")
private String wlxxGg;
@FieldMeta(fieldName = "SWLX_NAME", caption = "事务类型名称")
private String swlxmc;
@FieldMeta(fieldName = "BM_NAME", caption = "部门名称")
private String bmName;
@FieldMeta(fieldName = "KC_DJID", caption = "单据编号")
private String djid;
@FieldMeta(fieldName = "KC_CJSJ", caption = "创建时间")
private Date sjsj;
@FieldMeta(fieldName = "KC_YWRQ", caption = "业务日期")
private Date ywrq;
@FieldMeta(fieldName = "JCSL", caption = "结存数量")
private Double jcsl;
//HzKcswVO
@FieldMeta(fieldName = "U_WLXX_JZNAME", caption = "机种名称" )
private String jzname;
@FieldMeta(fieldName = "CK_CODE", caption = "仓库编码")
private String ckCode;
@FieldMeta(fieldName = "CK_NAME", caption = "仓库名称")
private String ckName;
@FieldMeta(fieldName = "WLXX_CODE", caption = "物料编码")
private String wlxxCode;
@FieldMeta(fieldName = "WLXX_NAME", caption = "物料名称")
private String wlxxName;
@FieldMeta(fieldName = "WLXX_AQKC", caption = "安全库存")
private Double aqkc;
@FieldMeta(fieldName = "JLDW_NAME", caption = "计量单位")
private String jldwname;
@FieldMeta(fieldName = "QCJCSL", caption = "期初结存数量")
private Double qcjcsl;
@FieldMeta(fieldName = "BQRKSL", caption = "本期入库数量")
private Double bqrksl;
@FieldMeta(fieldName = "BQCKSL", caption = "本期出库数量")
private Double bqcksl;
@FieldMeta(fieldName = "QMJCSL", caption = "期末结存数量")
private Double qmjcsl;
public String getWlxxGg() {
return wlxxGg;
}
public void setWlxxGg(String wlxxGg) {
this.wlxxGg = wlxxGg;
}
public String getSwlxmc() {
return swlxmc;
}
public void setSwlxmc(String swlxmc) {
this.swlxmc = swlxmc;
}
public String getBmName() {
return bmName;
}
public void setBmName(String bmName) {
this.bmName = bmName;
}
public String getDjid() {
return djid;
}
public void setDjid(String djid) {
this.djid = djid;
}
public Date getSjsj() {
return sjsj;
}
public void setSjsj(Date sjsj) {
this.sjsj = sjsj;
}
public Date getYwrq() {
return ywrq;
}
public void setYwrq(Date ywrq) {
this.ywrq = ywrq;
}
public Double getJcsl() {
return jcsl;
}
public void setJcsl(Double jcsl) {
this.jcsl = jcsl;
}
public String getJzname() {
return jzname;
}
public void setJzname(String jzname) {
this.jzname = jzname;
}
public String getCkCode() {
return ckCode;
}
public void setCkCode(String ckCode) {
this.ckCode = ckCode;
}
public String getCkName() {
return ckName;
}
public void setCkName(String ckName) {
this.ckName = ckName;
}
public String getWlxxCode() {
return wlxxCode;
}
public void setWlxxCode(String wlxxCode) {
this.wlxxCode = wlxxCode;
}
public String getWlxxName() {
return wlxxName;
}
public void setWlxxName(String wlxxName) {
this.wlxxName = wlxxName;
}
public Double getAqkc() {
return aqkc;
}
public void setAqkc(Double aqkc) {
this.aqkc = aqkc;
}
public String getJldwname() {
return jldwname;
}
public void setJldwname(String jldwname) {
this.jldwname = jldwname;
}
public Double getQcjcsl() {
return qcjcsl;
}
public void setQcjcsl(Double qcjcsl) {
this.qcjcsl = qcjcsl;
}
public Double getBqrksl() {
return bqrksl;
}
public void setBqrksl(Double bqrksl) {
this.bqrksl = bqrksl;
}
public Double getBqcksl() {
return bqcksl;
}
public void setBqcksl(Double bqcksl) {
this.bqcksl = bqcksl;
}
public Double getQmjcsl() {
return qmjcsl;
}
public void setQmjcsl(Double qmjcsl) {
this.qmjcsl = qmjcsl;
}
}
gavel/src/main/java/com/gavel/kwell/vo/HzWobomCondition.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.common.base.entity.BaseEntity;
import com.gavel.persistence.annotation.FieldMeta;
public class HzWobomCondition extends BaseEntity {
/**
*
*/
private static final long serialVersionUID = 1L;
/*---------AutoBegin-----------*/
@FieldMeta(caption = "ID" )
private String id;
@FieldMeta(caption = "任务单ID" )
private String woid;
@FieldMeta(caption = "物料编码" )
private String wlid;
@FieldMeta(caption = "关键物料" )
private String gjwl;
@FieldMeta(caption = "装配计划")
private String zpjhid;
@FieldMeta(caption = "组件物料编码")
private String zjwlid;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getWoid() {
return woid;
}
public void setWoid(String woid) {
this.woid = woid;
}
public String getWlid() {
return wlid;
}
public void setWlid(String wlid) {
this.wlid = wlid;
}
public String getGjwl() {
return gjwl;
}
public void setGjwl(String gjwl) {
this.gjwl = gjwl;
}
public String getZpjhid() {
return zpjhid;
}
public void setZpjhid(String zpjhid) {
this.zpjhid = zpjhid;
}
public String getZjwlid() {
return zjwlid;
}
public void setZjwlid(String zjwlid) {
this.zjwlid = zjwlid;
}
/*---------AutoEnd-------------*/
}
gavel/src/main/java/com/gavel/kwell/vo/HzWogylxCondition.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.common.base.entity.BaseEntity;
import java.util.Date;
public class HzWogylxCondition extends BaseEntity {
private static final long serialVersionUID = 1L;
private String id;
private String woid;
private String gcid;
private String name;
private String gxlx;
private String gzzxid;
private String bmid;
private Date start;
private Date end;
private String wodjid;
private String wlgg;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getWoid() {
return woid;
}
public void setWoid(String woid) {
this.woid = woid;
}
public String getGcid() {
return gcid;
}
public void setGcid(String gcid) {
this.gcid = gcid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getGxlx() {
return gxlx;
}
public void setGxlx(String gxlx) {
this.gxlx = gxlx;
}
public String getGzzxid() {
return gzzxid;
}
public void setGzzxid(String gzzxid) {
this.gzzxid = gzzxid;
}
public String getBmid() {
return bmid;
}
public void setBmid(String bmid) {
this.bmid = bmid;
}
public Date getStart() {
return start;
}
public void setStart(Date start) {
this.start = start;
}
public Date getEnd() {
return end;
}
public void setEnd(Date end) {
this.end = end;
}
public String getWodjid() {
return wodjid;
}
public void setWodjid(String wodjid) {
this.wodjid = wodjid;
}
public String getWlgg() {
return wlgg;
}
public void setWlgg(String wlgg) {
this.wlgg = wlgg;
}
}
gavel/src/main/java/com/gavel/kwell/vo/HzfklogCondition.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.common.base.entity.BaseEntity;
public class HzfklogCondition extends BaseEntity {
private static final long serialVersionUID = 1L;
private String id;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
}
gavel/src/main/java/com/gavel/kwell/vo/HzfklogVO.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.kwell.persistent.Hzfklog;
public class HzfklogVO extends Hzfklog {
private static final long serialVersionUID = 1L;
/*---------AutoBegin-----------*/
/*---------AutoEnd-------------*/
}
gavel/src/main/java/com/gavel/kwell/vo/UGylxCondition.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.common.base.entity.BaseEntity;
public class UGylxCondition extends BaseEntity {
private static final long serialVersionUID = 1L;
private String id;
private String code;
private String name;
private String gcid;
private String gzzxid;
private String wlid;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getGcid() {
return gcid;
}
public void setGcid(String gcid) {
this.gcid = gcid;
}
public String getGzzxid() {
return gzzxid;
}
public void setGzzxid(String gzzxid) {
this.gzzxid = gzzxid;
}
public String getWlid() {
return wlid;
}
public void setWlid(String wlid) {
this.wlid = wlid;
}
}
gavel/src/main/java/com/gavel/kwell/vo/UGylxVO.java deleted 100644 → 0
View file @ 5ba74e98
This diff is collapsed.
gavel/src/main/java/com/gavel/kwell/vo/UWobomVO.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.persistence.annotation.FieldMeta;
import com.gavel.wo.vo.WobomVO;
public class UWobomVO extends WobomVO {
/**
*
*/
private static final long serialVersionUID = 86890058784297904L;
@FieldMeta(caption = "条码数量")
private Integer sncount;
@FieldMeta(fieldName = "BZGX_CODE", caption = "标准工序编码")
private String bzgxcode;
@FieldMeta(fieldName = "BZGX_NAME", caption = "标准名称")
private String bzgxname;
public Integer getSncount() {
return sncount;
}
public void setSncount(Integer sncount) {
this.sncount = sncount;
}
public String getBzgxcode() {
return bzgxcode;
}
public void setBzgxcode(String bzgxcode) {
this.bzgxcode = bzgxcode;
}
public String getBzgxname() {
return bzgxname;
}
public void setBzgxname(String bzgxname) {
this.bzgxname = bzgxname;
}
}
gavel/src/main/java/com/gavel/kwell/vo/U_coderuleVO.java deleted 100644 → 0
View file @ 5ba74e98
package com.gavel.kwell.vo;
import com.gavel.kwell.persistent.U_coderule;
public class U_coderuleVO extends U_coderule {
private static final long serialVersionUID = 1L;
/*---------AutoBegin-----------*/
/*---------AutoEnd-------------*/
}
gavel/src/main/resources/module.xml
View file @ 070ba420
This diff is collapsed.
gavel/src/main/resources/static/images/logo.ico deleted 100644 → 0
View file @ 5ba74e98
This diff is collapsed.
gavel/src/main/resources/static/images/tongcan.png deleted 100644 → 0
View file @ 5ba74e98
This diff is collapsed.
gavel/src/main/resources/static/images/tsjboard.png deleted 100644 → 0
View file @ 5ba74e98
This diff is collapsed.
gavel/src/main/resources/static/images/tsjborad-title.png deleted 100644 → 0
View file @ 5ba74e98
This diff is collapsed.
gavel/src/main/resources/static/images/wx2.png deleted 100644 → 0
View file @ 5ba74e98
This diff is collapsed.
gavel/src/main/resources/static/images/wx7.png deleted 100644 → 0
View file @ 5ba74e98
This diff is collapsed.
gavel/src/main/resources/templates/views/index.html deleted 100644 → 0
View file @ 5ba74e98
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment