Commit 0c6142087663a9f883d6962352de7f4ede6fb70a
1 parent
950ab0df
出库单
Showing
10 changed files
with
368 additions
and
221 deletions
src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
0 → 100644
1 | +package com.huaheng.pc.shipment.shipmentHeader.controller; | |
2 | + | |
3 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
4 | +import com.baomidou.mybatisplus.core.metadata.IPage; | |
5 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |
6 | +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |
7 | +import com.huaheng.common.utils.StringUtils; | |
8 | +import com.huaheng.common.utils.security.ShiroUtils; | |
9 | +import com.huaheng.framework.aspectj.lang.annotation.Log; | |
10 | +import com.huaheng.framework.aspectj.lang.constant.BusinessType; | |
11 | +import com.huaheng.framework.web.controller.BaseController; | |
12 | +import com.huaheng.framework.web.domain.AjaxResult; | |
13 | +import com.huaheng.framework.web.page.PageDomain; | |
14 | +import com.huaheng.framework.web.page.TableDataInfo; | |
15 | +import com.huaheng.framework.web.page.TableSupport; | |
16 | +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; | |
17 | +import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService; | |
18 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
19 | +import org.springframework.beans.factory.annotation.Autowired; | |
20 | +import org.springframework.stereotype.Controller; | |
21 | +import org.springframework.ui.ModelMap; | |
22 | +import org.springframework.web.bind.annotation.*; | |
23 | + | |
24 | +import java.util.List; | |
25 | + | |
26 | + | |
27 | +/** | |
28 | + * 出库单主 信息操作处理 | |
29 | + * | |
30 | + * @author huaheng | |
31 | + * @date 2018-08-19 | |
32 | + */ | |
33 | +@Controller | |
34 | +@RequestMapping("/shipment/shipmentHeader") | |
35 | +public class ShipmentHeaderController extends BaseController | |
36 | +{ | |
37 | + private String prefix = "shipment/shipmentHeader"; | |
38 | + | |
39 | + @Autowired | |
40 | + private ShipmentHeaderService shipmentHeaderService; | |
41 | + | |
42 | + | |
43 | + @RequiresPermissions("shipment:bill:view") | |
44 | + @GetMapping() | |
45 | + public String shipmentHeader() | |
46 | + { | |
47 | + return prefix + "/shipmentHeader"; | |
48 | + } | |
49 | + | |
50 | + /** | |
51 | + * 查询出库单主列表 | |
52 | + */ | |
53 | + @RequiresPermissions("shipment:bill:list") | |
54 | + @Log(title = "出库-出库单", operating="查看出库主单", action = BusinessType.GRANT) | |
55 | + @PostMapping("/list") | |
56 | + @ResponseBody | |
57 | + public TableDataInfo list(ShipmentHeader shipmentHeader,String createdBegin, String createdEnd) | |
58 | + { | |
59 | + LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(); | |
60 | + PageDomain pageDomain = TableSupport.buildPageRequest(); | |
61 | + Integer pageNum = pageDomain.getPageNum(); | |
62 | + Integer pageSize = pageDomain.getPageSize(); | |
63 | + | |
64 | + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentHeader::getCreated, createdBegin) | |
65 | + .le(StringUtils.isNotEmpty(createdEnd), ShipmentHeader::getCreated, createdEnd) | |
66 | + .eq(ShipmentHeader::getWarehouseCode,ShiroUtils.getWarehouseCode()) | |
67 | + .eq(StringUtils.isNotEmpty(shipmentHeader.getCode()),ShipmentHeader::getCode,shipmentHeader.getCode()) | |
68 | + .eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()),ShipmentHeader::getShipmentType,shipmentHeader.getShipmentType()) | |
69 | + .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeader::getReferCode, shipmentHeader.getReferCode()) | |
70 | + .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeader::getReferCodeType, shipmentHeader.getReferCodeType()) | |
71 | + .eq(shipmentHeader.getFirstStatus()!=null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus()) | |
72 | + .eq(shipmentHeader.getLastStatus()!=null, ShipmentHeader::getLastStatus, shipmentHeader.getLastStatus()) | |
73 | + .orderByDesc(ShipmentHeader::getId); | |
74 | + | |
75 | + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ | |
76 | + /** | |
77 | + * 使用分页查询 | |
78 | + */ | |
79 | + Page<ShipmentHeader> page = new Page<>(pageNum, pageSize); | |
80 | + IPage<ShipmentHeader> iPage = shipmentHeaderService.page(page, lambdaQueryWrapper); | |
81 | + return getMpDataTable(iPage.getRecords(),iPage.getTotal()); | |
82 | + } else { | |
83 | + List<ShipmentHeader> list = shipmentHeaderService.list(lambdaQueryWrapper); | |
84 | + return getDataTable(list); | |
85 | + } | |
86 | + } | |
87 | + | |
88 | + /** | |
89 | + * 新增出库单主 | |
90 | + */ | |
91 | + @GetMapping("/add") | |
92 | + public String add() | |
93 | + { | |
94 | + return prefix + "/add"; | |
95 | + } | |
96 | + | |
97 | + /** | |
98 | + * 新增保存出库单主 | |
99 | + */ | |
100 | + @RequiresPermissions("shipment:bill:add") | |
101 | + @Log(title = "出库-出库单", operating="新增出库主单", action = BusinessType.INSERT) | |
102 | + @PostMapping("/add") | |
103 | + @ResponseBody | |
104 | + public AjaxResult addSave(ShipmentHeader shipmentHeader) | |
105 | + { | |
106 | + AjaxResult ajaxResult=shipmentHeaderService.saveHeader(shipmentHeader); | |
107 | + return ajaxResult; | |
108 | + } | |
109 | + | |
110 | +// /** | |
111 | +// * 修改出库单主 | |
112 | +// */ | |
113 | +// @GetMapping("/edit/{id}") | |
114 | +// public String edit(@PathVariable("id") Integer id, ModelMap mmap) | |
115 | +// { | |
116 | +// ShipmentHeader shipmentHeader = shipmentHeaderService.selectEntityById(id); | |
117 | +// mmap.put("shipmentHeader", shipmentHeader); | |
118 | +// return prefix + "/edit"; | |
119 | +// } | |
120 | +// | |
121 | +// /** | |
122 | +// * 修改保存出库单主 | |
123 | +// */ | |
124 | +// @RequiresPermissions("shipment:bill:edit") | |
125 | +// @Log(title = "出库-出库单", operating="修改出库主单", action = BusinessType.UPDATE) | |
126 | +// @PostMapping("/edit") | |
127 | +// @ResponseBody | |
128 | +// public AjaxResult editSave(ShipmentHeader shipmentHeader) | |
129 | +// { | |
130 | +// ShipmentHeader temp = shipmentHeaderService.selectEntityById(shipmentHeader.getId()); | |
131 | +// if(temp.getFirstStatus()>100){ | |
132 | +// return AjaxResult.error("已经超过订单池状态,不能修改"); | |
133 | +// } | |
134 | +// temp.setCompanyCode(shipmentHeader.getCompanyCode()); | |
135 | +// temp.setCompanyId(shipmentHeader.getCompanyId()); | |
136 | +// temp.setSourceCode(shipmentHeader.getSourceCode()); | |
137 | +// temp.setSourcePlatform(shipmentHeader.getSourcePlatform()); | |
138 | +// temp.setShipTo(shipmentHeader.getShipTo()); | |
139 | +// temp.setPriority(shipmentHeader.getPriority()); | |
140 | +// temp.setStation(shipmentHeader.getStation()); | |
141 | +// temp.setRemark(shipmentHeader.getRemark()); | |
142 | +// temp.setUploadremark(shipmentHeader.getUploadremark()); | |
143 | +// temp.setAppointmentTime(shipmentHeader.getAppointmentTime()); | |
144 | +// temp.setEnable(shipmentHeader.getEnable()); | |
145 | +// temp.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
146 | +// temp.setUserDef1(shipmentHeader.getUserDef1()); | |
147 | +// temp.setUserDef2(shipmentHeader.getUserDef2()); | |
148 | +// temp.setUserDef3(shipmentHeader.getUserDef3()); | |
149 | +// return toAjax(shipmentHeaderService.updateByModel(temp)); | |
150 | +// } | |
151 | +// | |
152 | +// /** | |
153 | +// * 删除出库单主 | |
154 | +// */ | |
155 | +// @RequiresPermissions("shipment:bill:remove") | |
156 | +// @Log(title = "出库-出库单", operating="删除出库主单", action = BusinessType.DELETE) | |
157 | +// @PostMapping( "/remove") | |
158 | +// @ResponseBody | |
159 | +// public AjaxResult remove(String ids) { | |
160 | +// if (StringUtils.isEmpty(ids)) | |
161 | +// return AjaxResult.error("id不能为空"); | |
162 | +// for (Integer id : Convert.toIntArray(ids)) | |
163 | +// { | |
164 | +// AjaxResult result = shipmentHeaderService.deleteHeaderAndDetail(id); | |
165 | +// if (result.code != RetCode.SUCCESS.getValue()) | |
166 | +// return result; | |
167 | +// } | |
168 | +// return AjaxResult.success("删除成功!"); | |
169 | +// } | |
170 | +// | |
171 | +// /** | |
172 | +// * 出库单报表打印 | |
173 | +// * @return | |
174 | +// */ | |
175 | +// @RequiresPermissions("shipment:bill:report") | |
176 | +// @Log(title = "出库-出库单", operating="打印出库单报表", action = BusinessType.OTHER) | |
177 | +// @GetMapping("/report/{id}") | |
178 | +// public String report(@PathVariable("id") Integer id, ModelMap mmap) | |
179 | +// { | |
180 | +// ShipmentHeader shipmentHeader = shipmentHeaderService.selectEntityById(id); | |
181 | +// mmap.put("shipmentHeader", shipmentHeader); | |
182 | +// | |
183 | +// ShipmentDetail shipmentDetail = new ShipmentDetail(); | |
184 | +// shipmentDetail.setShipmentId(id); | |
185 | +// List<ShipmentDetail> details = shipmentDetailService.getShipmentDetailListByLike(shipmentDetail); | |
186 | +// mmap.put("details", details); | |
187 | +// | |
188 | +// return prefix + "/report"; | |
189 | +// } | |
190 | +// | |
191 | +// /** | |
192 | +// * 手动组盘 | |
193 | +// */ | |
194 | +// @RequiresPermissions("shipment:bill:view") | |
195 | +// @Log(title = "出库-出库单", operating = "手动组盘", action = BusinessType.OTHER) | |
196 | +// @PostMapping( "/shipping") | |
197 | +// @ResponseBody | |
198 | +// public AjaxResult receive(String code, String ids) | |
199 | +// { | |
200 | +// AjaxResult ajaxResult=new AjaxResult(); | |
201 | +// if(StringUtils.isEmpty(ids)){ | |
202 | +// ajaxResult = shipmentHeaderService.shippings(code); | |
203 | +// }else { | |
204 | +// ajaxResult = shipmentHeaderService.shipping(code, ids.split(",")); | |
205 | +// } | |
206 | +// return ajaxResult; | |
207 | +// } | |
208 | +// | |
209 | +// @PostMapping("/getShipmentHeader") | |
210 | +// @ResponseBody | |
211 | +// public AjaxResult<ShipmentHeader> getShipmentHeader(int id){ | |
212 | +// return AjaxResult.success(shipmentHeaderService.selectEntityById(id)); | |
213 | +// } | |
214 | +} | |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java
... | ... | @@ -36,12 +36,7 @@ public class ShipmentHeader implements Serializable { |
36 | 36 | @ApiModelProperty(value = "货主") |
37 | 37 | private String companyCode; |
38 | 38 | |
39 | - /** | |
40 | - * 装载号 | |
41 | - */ | |
42 | - @TableField(value = "loadId") | |
43 | - @ApiModelProperty(value = "装载号") | |
44 | - private Integer loadId; | |
39 | + | |
45 | 40 | |
46 | 41 | /** |
47 | 42 | * 出库单号 |
... | ... | @@ -134,12 +129,7 @@ public class ShipmentHeader implements Serializable { |
134 | 129 | @ApiModelProperty(value = "要求到货时间") |
135 | 130 | private Date requestedDeliveryDate; |
136 | 131 | |
137 | - /** | |
138 | - * 要求到货类型 | |
139 | - */ | |
140 | - @TableField(value = "requestedDeliveryType") | |
141 | - @ApiModelProperty(value = "要求到货类型") | |
142 | - private String requestedDeliveryType; | |
132 | + | |
143 | 133 | |
144 | 134 | /** |
145 | 135 | * 计划发车日期 |
... | ... | @@ -225,26 +215,7 @@ public class ShipmentHeader implements Serializable { |
225 | 215 | @ApiModelProperty(value = "总行数") |
226 | 216 | private Integer totalLines; |
227 | 217 | |
228 | - /** | |
229 | - * 总拼箱数 | |
230 | - */ | |
231 | - @TableField(value = "totalContainers") | |
232 | - @ApiModelProperty(value = "总拼箱数") | |
233 | - private Integer totalContainers; | |
234 | - | |
235 | - /** | |
236 | - * 总整箱数 | |
237 | - */ | |
238 | - @TableField(value = "totalCases") | |
239 | - @ApiModelProperty(value = "总整箱数") | |
240 | - private Integer totalCases; | |
241 | 218 | |
242 | - /** | |
243 | - * 总价值 | |
244 | - */ | |
245 | - @TableField(value = "totalValue") | |
246 | - @ApiModelProperty(value = "总价值") | |
247 | - private BigDecimal totalValue; | |
248 | 219 | |
249 | 220 | /** |
250 | 221 | * 处理类型 |
... | ... | @@ -441,8 +412,6 @@ public class ShipmentHeader implements Serializable { |
441 | 412 | |
442 | 413 | public static final String COL_COMPANYCODE = "companyCode"; |
443 | 414 | |
444 | - public static final String COL_LOADID = "loadId"; | |
445 | - | |
446 | 415 | public static final String COL_CODE = "code"; |
447 | 416 | |
448 | 417 | public static final String COL_REFERCODE = "referCode"; |
... | ... | @@ -469,8 +438,6 @@ public class ShipmentHeader implements Serializable { |
469 | 438 | |
470 | 439 | public static final String COL_REQUESTEDDELIVERYDATE = "requestedDeliveryDate"; |
471 | 440 | |
472 | - public static final String COL_REQUESTEDDELIVERYTYPE = "requestedDeliveryType"; | |
473 | - | |
474 | 441 | public static final String COL_SCHEDULEDSHIPDATE = "scheduledShipDate"; |
475 | 442 | |
476 | 443 | public static final String COL_ACTUALSHIPDATETIME = "actualShipDateTime"; |
... | ... | @@ -495,12 +462,6 @@ public class ShipmentHeader implements Serializable { |
495 | 462 | |
496 | 463 | public static final String COL_TOTALLINES = "totalLines"; |
497 | 464 | |
498 | - public static final String COL_TOTALCONTAINERS = "totalContainers"; | |
499 | - | |
500 | - public static final String COL_TOTALCASES = "totalCases"; | |
501 | - | |
502 | - public static final String COL_TOTALVALUE = "totalValue"; | |
503 | - | |
504 | 465 | public static final String COL_PROCESSTYPE = "processType"; |
505 | 466 | |
506 | 467 | public static final String COL_LASTWAVEID = "lastWaveId"; |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentHeader/mapper/ShipmentHeaderMapper.java
... | ... | @@ -4,4 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
4 | 4 | import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; |
5 | 5 | |
6 | 6 | public interface ShipmentHeaderMapper extends BaseMapper<ShipmentHeader> { |
7 | + | |
8 | + /** | |
9 | + * 生成出库单编码 | |
10 | + * @return | |
11 | + */ | |
12 | + String createCode(String shipmentType); | |
13 | + | |
7 | 14 | } |
8 | 15 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java
1 | 1 | package com.huaheng.pc.shipment.shipmentHeader.service; |
2 | 2 | |
3 | +import com.huaheng.framework.web.domain.AjaxResult; | |
3 | 4 | import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; |
4 | 5 | import com.baomidou.mybatisplus.extension.service.IService; |
5 | 6 | public interface ShipmentHeaderService extends IService<ShipmentHeader>{ |
6 | 7 | |
8 | + //新增出库主单 | |
9 | + AjaxResult<Boolean> saveHeader(ShipmentHeader shipmentHeader) ; | |
10 | + | |
11 | + | |
12 | + //根据单据类型建单据号 | |
13 | + String createCode(String shipmentType); | |
7 | 14 | |
8 | 15 | } |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
1 | 1 | package com.huaheng.pc.shipment.shipmentHeader.service; |
2 | 2 | |
3 | +import com.huaheng.common.utils.security.ShiroUtils; | |
4 | +import com.huaheng.framework.web.domain.AjaxResult; | |
5 | +import com.huaheng.pc.system.dict.service.IDictDataService; | |
6 | +import org.springframework.beans.factory.annotation.Autowired; | |
3 | 7 | import org.springframework.stereotype.Service; |
4 | 8 | import javax.annotation.Resource; |
9 | +import java.text.SimpleDateFormat; | |
10 | +import java.util.Date; | |
5 | 11 | import java.util.List; |
6 | 12 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
7 | 13 | import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; |
... | ... | @@ -10,4 +16,50 @@ import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService; |
10 | 16 | @Service |
11 | 17 | public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper, ShipmentHeader> implements ShipmentHeaderService{ |
12 | 18 | |
19 | + @Autowired | |
20 | + private IDictDataService dictDataService; | |
21 | + @Resource | |
22 | + private ShipmentHeaderMapper shipmentHeaderMapper; | |
23 | + | |
24 | + | |
25 | + //新增出库主单 | |
26 | + @Override | |
27 | + public AjaxResult<Boolean> saveHeader(ShipmentHeader shipmentHeader) { | |
28 | + if(dictDataService.checkConfig("shipmentType", shipmentHeader.getShipmentType()) == false) | |
29 | + { | |
30 | + return AjaxResult.error("没有对应的出库单类型"); | |
31 | + } | |
32 | + String code = createCode(shipmentHeader.getShipmentType()); | |
33 | + shipmentHeader.setId(null); | |
34 | + shipmentHeader.setFirstStatus(0); | |
35 | + shipmentHeader.setLastStatus(0); | |
36 | + shipmentHeader.setLastUpdated(null); | |
37 | + shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
38 | + shipmentHeader.setCreated(null); | |
39 | + shipmentHeader.setCreatedBy(ShiroUtils.getLoginName()); | |
40 | + shipmentHeader.setWarehouseCode(ShiroUtils.getWarehouseCode()); | |
41 | + shipmentHeader.setCode(code); | |
42 | + boolean result = this.save(shipmentHeader); | |
43 | + return AjaxResult.toAjax(result); | |
44 | + } | |
45 | + | |
46 | + | |
47 | + //根据单据类型建单据号 | |
48 | + public String createCode(String shipmentType) | |
49 | + { | |
50 | + String code = null; | |
51 | + Date now = new Date(); | |
52 | + SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd"); | |
53 | + String maxCode = shipmentHeaderMapper.createCode(shipmentType); | |
54 | + if (maxCode != null && maxCode.length() > 13 && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now))) | |
55 | + { | |
56 | + Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length())); | |
57 | + code = shipmentType + df.format(now) + String.format("%05d", Count + 1); | |
58 | + } | |
59 | + else | |
60 | + { | |
61 | + code = shipmentType + df.format(now) + "00001"; | |
62 | + } | |
63 | + return code; | |
64 | + } | |
13 | 65 | } |
... | ... |
src/main/resources/mybatis/shipment/ShipmentHeaderMapper.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
3 | -<mapper namespace="com.huaheng.pc.general.customer.mapper.ShipmentHeaderMapper"> | |
3 | +<mapper namespace="com.huaheng.pc.shipment.shipmentHeader.mapper.ShipmentHeaderMapper"> | |
4 | 4 | <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader"> |
5 | 5 | <!--@mbg.generated--> |
6 | 6 | <id column="id" jdbcType="INTEGER" property="id" /> |
7 | 7 | <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> |
8 | 8 | <result column="companyCode" jdbcType="VARCHAR" property="companyCode" /> |
9 | - <result column="loadId" jdbcType="INTEGER" property="loadId" /> | |
10 | 9 | <result column="code" jdbcType="VARCHAR" property="code" /> |
11 | 10 | <result column="referCode" jdbcType="VARCHAR" property="referCode" /> |
12 | 11 | <result column="referCodeType" jdbcType="VARCHAR" property="referCodeType" /> |
... | ... | @@ -20,7 +19,6 @@ |
20 | 19 | <result column="customerName" jdbcType="VARCHAR" property="customerName" /> |
21 | 20 | <result column="priority" jdbcType="INTEGER" property="priority" /> |
22 | 21 | <result column="requestedDeliveryDate" jdbcType="DATE" property="requestedDeliveryDate" /> |
23 | - <result column="requestedDeliveryType" jdbcType="VARCHAR" property="requestedDeliveryType" /> | |
24 | 22 | <result column="scheduledShipDate" jdbcType="DATE" property="scheduledShipDate" /> |
25 | 23 | <result column="actualShipDateTime" jdbcType="TIMESTAMP" property="actualShipDateTime" /> |
26 | 24 | <result column="actualDeliveryDate" jdbcType="DATE" property="actualDeliveryDate" /> |
... | ... | @@ -33,9 +31,6 @@ |
33 | 31 | <result column="totalQty" jdbcType="INTEGER" property="totalQty" /> |
34 | 32 | <result column="totalVolume" jdbcType="DECIMAL" property="totalVolume" /> |
35 | 33 | <result column="totalLines" jdbcType="INTEGER" property="totalLines" /> |
36 | - <result column="totalContainers" jdbcType="INTEGER" property="totalContainers" /> | |
37 | - <result column="totalCases" jdbcType="INTEGER" property="totalCases" /> | |
38 | - <result column="totalValue" jdbcType="DECIMAL" property="totalValue" /> | |
39 | 34 | <result column="processType" jdbcType="VARCHAR" property="processType" /> |
40 | 35 | <result column="lastWaveId" jdbcType="INTEGER" property="lastWaveId" /> |
41 | 36 | <result column="signValue" jdbcType="VARCHAR" property="signValue" /> |
... | ... | @@ -66,16 +61,19 @@ |
66 | 61 | </resultMap> |
67 | 62 | <sql id="Base_Column_List"> |
68 | 63 | <!--@mbg.generated--> |
69 | - id, warehouseCode, companyCode, loadId, code, referCode, referCodeType, referId, | |
64 | + id, warehouseCode, companyCode, code, referCode, referCodeType, referId, | |
70 | 65 | referPlatform, firstStatus, lastStatus, shipmentType, route, customerCode, customerName, |
71 | - priority, requestedDeliveryDate, requestedDeliveryType, scheduledShipDate, actualShipDateTime, | |
66 | + priority, requestedDeliveryDate, scheduledShipDate, actualShipDateTime, | |
72 | 67 | actualDeliveryDate, deliveryNote, rejectionNote, waveId, shipDock, allocateComplete, |
73 | - totalWeight, totalQty, totalVolume, totalLines, totalContainers, totalCases, totalValue, | |
68 | + totalWeight, totalQty, totalVolume, totalLines, | |
74 | 69 | processType, lastWaveId, signValue, carrierCode, carrierService, shipmentNote, carrierServer, |
75 | 70 | carrierServerName, plateNumber, carModel, driverName, driverTel, created, createdBy, |
76 | 71 | lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, |
77 | 72 | userDef6, userDef7, userDef8, processStamp, deleted |
78 | 73 | </sql> |
79 | 74 | |
75 | + <select id="createCode" resultType="java.lang.String"> | |
76 | + SELECT code FROM shipment_header WHERE shipmentType = #{shipmentType,jdbcType=VARCHAR} ORDER BY id DESC LIMIT 1 | |
77 | + </select> | |
80 | 78 | |
81 | 79 | </mapper> |
82 | 80 | \ No newline at end of file |
... | ... |
src/main/resources/templates/shipment/shipmentHeader/add.html
... | ... | @@ -8,7 +8,7 @@ |
8 | 8 | <div class="form-group"> |
9 | 9 | <label class="col-sm-3 control-label">出库单类型:</label> |
10 | 10 | <div class="col-sm-8"> |
11 | - <select id="type" class="form-control" th:with="shipmentType=${@dict.getType('shipmentType')}"> | |
11 | + <select id="shipmentType" class="form-control" th:with="shipmentType=${@dict.getType('shipmentType')}"> | |
12 | 12 | <option th:each="dict : ${shipmentType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> |
13 | 13 | </select> |
14 | 14 | </div> |
... | ... | @@ -16,27 +16,27 @@ |
16 | 16 | <div class="form-group"> |
17 | 17 | <label class="col-sm-3 control-label">货主:</label> |
18 | 18 | <div class="col-sm-8"> |
19 | - <select id = "company" name="company" class="form-control" th:with="list=${@company.selectCompanyByCurrentUserId()}"> | |
19 | + <select id = "companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.selectCompanyByCurrentUserId()}"> | |
20 | 20 | <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr = " code = ${item['code']}"></option> |
21 | 21 | </select> |
22 | 22 | </div> |
23 | 23 | </div> |
24 | 24 | <div class="form-group"> |
25 | - <label class="col-sm-3 control-label">上游系统单号:</label> | |
25 | + <label class="col-sm-3 control-label">erp订单号:</label> | |
26 | 26 | <div class="col-sm-8"> |
27 | - <input id="sourceCode" name="sourceCode" class="form-control" type="text"> | |
27 | + <input id="referCode" name="referCode" class="form-control" type="text"> | |
28 | 28 | </div> |
29 | 29 | </div> |
30 | 30 | <div class="form-group"> |
31 | 31 | <label class="col-sm-3 control-label">上游平台:</label> |
32 | 32 | <div class="col-sm-8"> |
33 | - <input id="sourcePlatform" name="sourcePlatform" class="form-control" type="text"> | |
33 | + <input id="referPlatform" name="referPlatform" class="form-control" type="text"> | |
34 | 34 | </div> |
35 | 35 | </div> |
36 | 36 | <div class="form-group"> |
37 | 37 | <label class="col-sm-3 control-label">客户编码:</label> |
38 | 38 | <div class="col-sm-8"> |
39 | - <input id="shipTo" name="shipTo" class="form-control" type="text"> | |
39 | + <input id="customerCode" name="customerCode" class="form-control" type="text"> | |
40 | 40 | <!--<select id="shipTo" class="form-control m-b" th:with="shipmentType=${@dict.getType('shipmentType')}">--> |
41 | 41 | <!--<option th:each="dict : ${shipmentType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>--> |
42 | 42 | <!--</select>--> |
... | ... | @@ -49,15 +49,6 @@ |
49 | 49 | </div> |
50 | 50 | </div> |
51 | 51 | <div class="form-group"> |
52 | - <label class="col-sm-3 control-label">发货站台:</label> | |
53 | - <div class="col-sm-8"> | |
54 | - <!--<input id="station" name="station" class="form-control" type="text">--> | |
55 | - <select id="station" name="station" class="form-control" th:with="station=${@dict.getType('station')}"> | |
56 | - <option th:each="dict : ${station}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
57 | - </select> | |
58 | - </div> | |
59 | - </div> | |
60 | - <div class="form-group"> | |
61 | 52 | <label class="col-sm-3 control-label">总数量:</label> |
62 | 53 | <div class="col-sm-8"> |
63 | 54 | <input id="totalQty" name="totalQty" class="form-control" type="text"> |
... | ... | @@ -69,30 +60,24 @@ |
69 | 60 | <input id="totalLines" name="totalLines" class="form-control" type="text"> |
70 | 61 | </div> |
71 | 62 | </div> |
72 | - <div class="form-group"> | |
73 | - <label class="col-sm-3 control-label">备注:</label> | |
74 | - <div class="col-sm-8"> | |
75 | - <input id="remark" name="remark" class="form-control" type="text"> | |
76 | - </div> | |
77 | - </div> | |
78 | - <div class="form-group"> | |
79 | - <label class="col-sm-3 control-label">发货预约时间:</label> | |
80 | - <div class="col-sm-8"> | |
81 | - <input id="appointmentTime" name="appointmentTime" class="form-control" type="text"> | |
82 | - </div> | |
83 | - </div> | |
84 | 63 | <div class="form-group"> |
85 | - <label class="col-sm-3 control-label">是否有效:</label> | |
64 | + <label class="col-sm-3 control-label">要求到货时间:</label> | |
86 | 65 | <div class="col-sm-8"> |
87 | - <div class="onoffswitch"> | |
88 | - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable"> | |
89 | - <label class="onoffswitch-label" for="enable"> | |
90 | - <span class="onoffswitch-inner"></span> | |
91 | - <span class="onoffswitch-switch"></span> | |
92 | - </label> | |
93 | - </div> | |
66 | + <input id="requestedDeliveryDate" name="requestedDeliveryDate" class="form-control" type="text"> | |
94 | 67 | </div> |
95 | 68 | </div> |
69 | + <!--<div class="form-group">--> | |
70 | + <!--<label class="col-sm-3 control-label">是否有效:</label>--> | |
71 | + <!--<div class="col-sm-8">--> | |
72 | + <!--<div class="onoffswitch">--> | |
73 | + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">--> | |
74 | + <!--<label class="onoffswitch-label" for="enable">--> | |
75 | + <!--<span class="onoffswitch-inner"></span>--> | |
76 | + <!--<span class="onoffswitch-switch"></span>--> | |
77 | + <!--</label>--> | |
78 | + <!--</div>--> | |
79 | + <!--</div>--> | |
80 | + <!--</div>--> | |
96 | 81 | <!--<div class="form-group"> --> |
97 | 82 | <!--<label class="col-sm-3 control-label">自定义字段1:</label>--> |
98 | 83 | <!--<div class="col-sm-8">--> |
... | ... | @@ -149,22 +134,15 @@ |
149 | 134 | type: "POST", |
150 | 135 | url: prefix + "/add", |
151 | 136 | data: { |
152 | - "type": $("#type option:selected").val(), | |
153 | - "companyId": $("#company option:selected").val(), | |
154 | - "companyCode": $("#company option:selected").attr("code"), | |
155 | - "sourceCode": $("input[name='sourceCode']").val(), | |
156 | - "sourcePlatform": $("input[name='sourcePlatform']").val(), | |
157 | - "shipTo": $("input[name='shipTo']").val(), | |
137 | + "shipmentType": $("#shipmentType option:selected").val(), | |
138 | + "companyCode": $("#companyCode option:selected").attr("code"), | |
139 | + "referCode": $("input[name='referCode']").val(), | |
140 | + "referPlatform": $("input[name='referPlatform']").val(), | |
141 | + "customerCode": $("input[name='customerCode']").val(), | |
158 | 142 | "priority": $("input[name='priority']").val(), |
159 | - "station": $("#station option:selected").val(), | |
160 | 143 | "totalQty": $("input[name='totalQty']").val(), |
161 | 144 | "totalLines": $("input[name='totalLines']").val(), |
162 | - "remark": $("input[name='remark']").val(), | |
163 | - "appointmentTime": $("input[name='appointmentTime']").val(), | |
164 | - "enable": $("input[name='enable']").is(':checked'), | |
165 | - "userDef1": $("input[name='userDef1']").val(), | |
166 | - "userDef2": $("input[name='userDef2']").val(), | |
167 | - "userDef3": $("input[name='userDef3']").val(), | |
145 | + "requestedDeliveryDate": $("input[name='requestedDeliveryDate']").val(), | |
168 | 146 | }, |
169 | 147 | async: false, |
170 | 148 | error: function (request) { |
... | ... |
src/main/resources/templates/shipment/shipmentHeader/edit.html
... | ... | @@ -15,27 +15,27 @@ |
15 | 15 | <div class="form-group"> |
16 | 16 | <label class="col-sm-3 control-label">货主:</label> |
17 | 17 | <div class="col-sm-8"> |
18 | - <select id="company" name="company" class="form-control" th:with="list=${@company.selectCompanyByCurrentUserId()}" th:field="*{companyId}" readonly="readonly" disabled="disabled"> | |
18 | + <select id="companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.selectCompanyByCurrentUserId()}" th:field="*{companyId}" readonly="readonly" disabled="disabled"> | |
19 | 19 | <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr="code = ${item['code']}"></option> |
20 | 20 | </select> |
21 | 21 | </div> |
22 | 22 | </div> |
23 | 23 | <div class="form-group"> |
24 | - <label class="col-sm-3 control-label">上游系统单号:</label> | |
24 | + <label class="col-sm-3 control-label">erp订单号:</label> | |
25 | 25 | <div class="col-sm-8"> |
26 | - <input id="sourceCode" name="sourceCode" th:field="*{sourceCode}" class="form-control" type="text" readonly="readonly"> | |
26 | + <input id="referCode" name="referCode" th:field="*{referCode}" class="form-control" type="text" readonly="readonly"> | |
27 | 27 | </div> |
28 | 28 | </div> |
29 | 29 | <div class="form-group"> |
30 | - <label class="col-sm-3 control-label">上游平台:</label> | |
30 | + <label class="col-sm-3 control-label">订单平台:</label> | |
31 | 31 | <div class="col-sm-8"> |
32 | - <input id="sourcePlatform" name="sourcePlatform" th:field="*{sourcePlatform}" class="form-control" type="text" readonly="readonly"> | |
32 | + <input id="referPlatform" name="referPlatform" th:field="*{referPlatform}" class="form-control" type="text" readonly="readonly"> | |
33 | 33 | </div> |
34 | 34 | </div> |
35 | 35 | <div class="form-group"> |
36 | 36 | <label class="col-sm-3 control-label">出库单类型:</label> |
37 | 37 | <div class="col-sm-8"> |
38 | - <select id="type" class="form-control" th:with="shipmentType=${@dict.getType('shipmentType')}" th:field="*{type}" readonly="readonly" disabled="disabled"> | |
38 | + <select id="shipmentType" class="form-control" th:with="shipmentType=${@dict.getType('shipmentType')}" th:field="*{type}" readonly="readonly" disabled="disabled"> | |
39 | 39 | <option th:each="dict : ${shipmentType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" ></option> |
40 | 40 | </select> |
41 | 41 | </div> |
... | ... | @@ -43,7 +43,7 @@ |
43 | 43 | <div class="form-group"> |
44 | 44 | <label class="col-sm-3 control-label">客户编码:</label> |
45 | 45 | <div class="col-sm-8"> |
46 | - <input id="shipTo" name="shipTo" th:field="*{shipTo}" class="form-control" type="text"> | |
46 | + <input id="customerCode" name="customerCode" th:field="*{customerCode}" class="form-control" type="text"> | |
47 | 47 | </div> |
48 | 48 | </div> |
49 | 49 | <div class="form-group"> |
... | ... | @@ -53,12 +53,6 @@ |
53 | 53 | </div> |
54 | 54 | </div> |
55 | 55 | <div class="form-group"> |
56 | - <label class="col-sm-3 control-label">发货站台:</label> | |
57 | - <div class="col-sm-8"> | |
58 | - <input id="station" name="station" th:field="*{station}" class="form-control" type="text"> | |
59 | - </div> | |
60 | - </div> | |
61 | - <div class="form-group"> | |
62 | 56 | <label class="col-sm-3 control-label">总数量:</label> |
63 | 57 | <div class="col-sm-8"> |
64 | 58 | <input id="totalQty" name="totalQty" th:field="*{totalQty}" class="form-control" type="text" readonly="readonly"> |
... | ... | @@ -70,12 +64,6 @@ |
70 | 64 | <input id="totalLines" name="totalLines" th:field="*{totalLines}" class="form-control" type="text" readonly="readonly"> |
71 | 65 | </div> |
72 | 66 | </div> |
73 | - <div class="form-group"> | |
74 | - <label class="col-sm-3 control-label">备注:</label> | |
75 | - <div class="col-sm-8"> | |
76 | - <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text"> | |
77 | - </div> | |
78 | - </div> | |
79 | 67 | <!--<div class="form-group"> |
80 | 68 | <label class="col-sm-3 control-label">上传备注:</label> |
81 | 69 | <div class="col-sm-8"> |
... | ... | @@ -83,15 +71,9 @@ |
83 | 71 | </div> |
84 | 72 | </div>--> |
85 | 73 | <div class="form-group"> |
86 | - <label class="col-sm-3 control-label">上传时间:</label> | |
74 | + <label class="col-sm-3 control-label">要求到货时间:</label> | |
87 | 75 | <div class="col-sm-8"> |
88 | - <input id="uploadTime" name="uploadTime" th:field="*{uploadTime}" class="form-control" type="text" readonly="readonly"> | |
89 | - </div> | |
90 | - </div> | |
91 | - <div class="form-group"> | |
92 | - <label class="col-sm-3 control-label">发货预约时间:</label> | |
93 | - <div class="col-sm-8"> | |
94 | - <input id="appointmentTime" name="appointmentTime" th:field="*{appointmentTime}" class="form-control" type="text"> | |
76 | + <input id="requestedDeliveryDate" name="requestedDeliveryDate" th:field="*{requestedDeliveryDate}" class="form-control" type="text"> | |
95 | 77 | </div> |
96 | 78 | </div> |
97 | 79 | <div class="form-group"> |
... | ... | @@ -110,16 +92,16 @@ |
110 | 92 | </select> |
111 | 93 | </div> |
112 | 94 | </div> |
113 | - <div class="form-group"> | |
114 | - <label class="col-sm-3 control-label">上传状态:</label> | |
115 | - <div class="col-sm-8"> | |
116 | - <!--<input id="uploadStatus" name="uploadStatus" th:field="*{uploadStatus}" class="form-control" type="text" readonly="readonly">--> | |
95 | + <!--<div class="form-group">--> | |
96 | + <!--<label class="col-sm-3 control-label">上传状态:</label>--> | |
97 | + <!--<div class="col-sm-8">--> | |
98 | + <!--<!–<input id="uploadStatus" name="uploadStatus" th:field="*{uploadStatus}" class="form-control" type="text" readonly="readonly">–>--> | |
117 | 99 | |
118 | - <select id="uploadStatus" class="form-control" th:with="uploadStatus=${@dict.getType('uploadStatus')}" th:field="*{uploadStatus}" disabled="disabled"> | |
119 | - <option th:each="dict : ${uploadStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" ></option> | |
120 | - </select> | |
121 | - </div> | |
122 | - </div> | |
100 | + <!--<select id="uploadStatus" class="form-control" th:with="uploadStatus=${@dict.getType('uploadStatus')}" th:field="*{uploadStatus}" disabled="disabled">--> | |
101 | + <!--<option th:each="dict : ${uploadStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" ></option>--> | |
102 | + <!--</select>--> | |
103 | + <!--</div>--> | |
104 | + <!--</div>--> | |
123 | 105 | <!--<div class="form-group"> --> |
124 | 106 | <!--<label class="col-sm-3 control-label">创建时间:</label>--> |
125 | 107 | <!--<div class="col-sm-8">--> |
... | ... | @@ -144,24 +126,24 @@ |
144 | 126 | <!--<input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text" readonly="readonly">--> |
145 | 127 | <!--</div>--> |
146 | 128 | <!--</div>--> |
147 | - <div class="form-group"> | |
129 | + <!--<div class="form-group"> --> | |
130 | + <!--<!–<label class="col-sm-3 control-label">是否有效:</label>–>--> | |
131 | + <!--<!–<div class="col-sm-8">–>--> | |
132 | + <!--<!–<!–<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">–>–>--> | |
133 | + <!--<!–<input type="radio" name="enable" value="true" th:checked="*{enable}" >是–>--> | |
134 | + <!--<!–<input type="radio" name="enable" value="false" th:checked="*{enable}">否–>--> | |
135 | + <!--<!–</div>–>--> | |
148 | 136 | <!--<label class="col-sm-3 control-label">是否有效:</label>--> |
149 | 137 | <!--<div class="col-sm-8">--> |
150 | - <!--<!–<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">–>--> | |
151 | - <!--<input type="radio" name="enable" value="true" th:checked="*{enable}" >是--> | |
152 | - <!--<input type="radio" name="enable" value="false" th:checked="*{enable}">否--> | |
138 | + <!--<div class="onoffswitch">--> | |
139 | + <!--<input type="checkbox" th:checked="${shipmentHeader.enable}" class="onoffswitch-checkbox" id="enable" name="enable">--> | |
140 | + <!--<label class="onoffswitch-label" for="enable">--> | |
141 | + <!--<span class="onoffswitch-inner"></span>--> | |
142 | + <!--<span class="onoffswitch-switch"></span>--> | |
143 | + <!--</label>--> | |
144 | + <!--</div>--> | |
153 | 145 | <!--</div>--> |
154 | - <label class="col-sm-3 control-label">是否有效:</label> | |
155 | - <div class="col-sm-8"> | |
156 | - <div class="onoffswitch"> | |
157 | - <input type="checkbox" th:checked="${shipmentHeader.enable}" class="onoffswitch-checkbox" id="enable" name="enable"> | |
158 | - <label class="onoffswitch-label" for="enable"> | |
159 | - <span class="onoffswitch-inner"></span> | |
160 | - <span class="onoffswitch-switch"></span> | |
161 | - </label> | |
162 | - </div> | |
163 | - </div> | |
164 | - </div> | |
146 | + <!--</div>--> | |
165 | 147 | <!--<div class="form-group">--> |
166 | 148 | <!--<label class="col-sm-3 control-label">扩展属性1:</label>--> |
167 | 149 | <!--<div class="col-sm-8">--> |
... | ... | @@ -196,9 +178,7 @@ |
196 | 178 | submitHandler: function(form) { |
197 | 179 | // var tableValue = $.common.getTableValue("#form-shipmentHeader-edit"); |
198 | 180 | var tableValue = $("#form-shipmentHeader-edit").serialize(); |
199 | - tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked')); | |
200 | - tableValue = formValueReplace(tableValue, "companyId", $("#company option:selected").val()); | |
201 | - tableValue = formValueReplace(tableValue, "companyCode", $("#company option:selected").attr("code")); | |
181 | + tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").attr("code")); | |
202 | 182 | $.operate.save(prefix + "/edit", tableValue); |
203 | 183 | } |
204 | 184 | }); |
... | ... |
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
... | ... | @@ -28,13 +28,19 @@ |
28 | 28 | </li> |
29 | 29 | <li> |
30 | 30 | <!--入库类型:<input type="text" name="sourceCode"/>--> |
31 | - 出库类型:<select name="type" th:with="type=${@dict.getType('shipmentType')}"> | |
31 | + 出库类型:<select name="shipmentType" th:with="shipmentType=${@dict.getType('shipmentType')}"> | |
32 | 32 | <option value="">所有</option> |
33 | - <option th:each="e : ${type}" th:text="${e['dictLabel']}" | |
33 | + <option th:each="e : ${shipmentType}" th:text="${e['dictLabel']}" | |
34 | 34 | th:value="${e['dictValue']}"></option> |
35 | 35 | </select> |
36 | 36 | </li> |
37 | 37 | <li> |
38 | + erp单号:<input type="text" name="referCode"/> | |
39 | + </li> | |
40 | + <li> | |
41 | + erp订单类型:<input type="text" name="referCodeType"/> | |
42 | + </li> | |
43 | + <li> | |
38 | 44 | 客户编码:<input type="text" name="sourceCode"/> |
39 | 45 | </li> |
40 | 46 | <li> |
... | ... | @@ -55,24 +61,13 @@ |
55 | 61 | th:value="${e['dictValue']}"></option> |
56 | 62 | </select> |
57 | 63 | </li> |
58 | - <li> | |
59 | - 上游单号:<input type="text" name="sourceCode"/> | |
60 | - </li> | |
61 | - <li> | |
62 | - u8仓库:<select name="uWarehouseCode" th:with="warehouse=${@warehouse.selectList()}"> | |
63 | - <option value="">所有</option> | |
64 | - <option th:each="e : ${warehouse}" th:text="${e['uWarehouseName']}" th:value="${e['uWarehouseCode']}"></option></select> | |
65 | - </li> | |
66 | - <li> | |
67 | - 上游平台:<input type="text" name="sourcePlatform"/> | |
68 | - </li> | |
69 | 64 | <li class="time"> |
70 | 65 | <label>创建时间: </label> |
71 | 66 | <input type="text" class="time-input" id="startTime" placeholder="开始时间" |
72 | - name="params[createdBegin]"/> | |
67 | + name="createdBegin"/> | |
73 | 68 | <span>-</span> |
74 | 69 | <input type="text" class="time-input" id="endTime" placeholder="结束时间" |
75 | - name="params[createdEnd]"/> | |
70 | + name="createdEnd"/> | |
76 | 71 | </li> |
77 | 72 | <li> |
78 | 73 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i |
... | ... | @@ -248,33 +243,23 @@ |
248 | 243 | sortable:true |
249 | 244 | }, |
250 | 245 | { |
251 | - field: 'companyId', | |
252 | - title: '货主标识', | |
253 | - visible:false | |
254 | - }, | |
255 | - { | |
256 | 246 | field: 'companyCode', |
257 | 247 | title: '货主', |
258 | 248 | sortable:true |
259 | 249 | }, |
260 | 250 | { |
261 | - field: 'sourceCode', | |
262 | - title: '上游单号', | |
251 | + field: 'referCode', | |
252 | + title: 'erp订单号', | |
263 | 253 | sortable:true |
264 | 254 | }, |
265 | 255 | { |
266 | - field: 'sourcePlatform', | |
267 | - title: '上游平台', | |
256 | + field: 'referCodeType', | |
257 | + title: 'erp订单内部号', | |
268 | 258 | sortable:true, |
269 | 259 | visible:false |
270 | 260 | }, |
271 | 261 | { |
272 | - field : 'uWarehouseCode', | |
273 | - title : 'U8仓库', | |
274 | - sortable:true | |
275 | - }, | |
276 | - { | |
277 | - field: 'type', | |
262 | + field: 'shipmentType', | |
278 | 263 | title: '类型', |
279 | 264 | align: 'center', |
280 | 265 | formatter: function(value, row, index) { |
... | ... | @@ -284,7 +269,7 @@ |
284 | 269 | |
285 | 270 | }, |
286 | 271 | { |
287 | - field: 'shipTo', | |
272 | + field: 'customerCode', | |
288 | 273 | title: '客户编码', |
289 | 274 | sortable:true |
290 | 275 | }, |
... | ... | @@ -293,12 +278,8 @@ |
293 | 278 | title: '优先级' |
294 | 279 | }, |
295 | 280 | { |
296 | - field: 'station', | |
297 | - title: '发货站台', | |
298 | - align: 'center', | |
299 | - formatter: function(value, row, index) { | |
300 | - return $.table.selectDictLabel(stations, value); | |
301 | - }, | |
281 | + field: 'route', | |
282 | + title: '路线', | |
302 | 283 | sortable:true |
303 | 284 | }, |
304 | 285 | { |
... | ... | @@ -310,25 +291,6 @@ |
310 | 291 | title: '总行数' |
311 | 292 | }, |
312 | 293 | { |
313 | - field: 'remark', | |
314 | - title: '备注' | |
315 | - }, | |
316 | - { | |
317 | - field: 'uploadremark', | |
318 | - title: '上传备注', | |
319 | - visible:false | |
320 | - }, | |
321 | - { | |
322 | - field: 'uploadTime', | |
323 | - title: '上传时间', | |
324 | - visible:false | |
325 | - }, | |
326 | - { | |
327 | - field: 'appointmentTime', | |
328 | - title: '发货预约时间', | |
329 | - visible:false | |
330 | - }, | |
331 | - { | |
332 | 294 | field: 'firstStatus', |
333 | 295 | title: '头状态', |
334 | 296 | formatter: function(value, row, index) { |
... | ... | @@ -345,11 +307,6 @@ |
345 | 307 | sortable:true |
346 | 308 | }, |
347 | 309 | { |
348 | - field: 'uploadStatus', | |
349 | - title: '上传状态', | |
350 | - visible:false | |
351 | - }, | |
352 | - { | |
353 | 310 | field: 'created', |
354 | 311 | title: '创建时间', |
355 | 312 | sortable: true |
... | ... | @@ -369,13 +326,6 @@ |
369 | 326 | visible:false |
370 | 327 | }, |
371 | 328 | { |
372 | - field: 'enable', | |
373 | - title: '是否有效', | |
374 | - formatter: function(value, row, index) { | |
375 | - return $.table.selectDictLabel(datas, value); | |
376 | - } | |
377 | - }, | |
378 | - { | |
379 | 329 | title: '操作', |
380 | 330 | align: 'center', |
381 | 331 | formatter: function (value, row, index) { |
... | ... |