Commit 5244090c3ac4a768a219a04a1a8fb7805aba7922
1 parent
51105b1b
修改入库单新增页面
Showing
4 changed files
with
113 additions
and
329 deletions
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
| ... | ... | @@ -110,14 +110,11 @@ public class ReceiptDetailController extends BaseController { |
| 110 | 110 | /** |
| 111 | 111 | * 新增入库明细 |
| 112 | 112 | */ |
| 113 | - @GetMapping("/add/{id}/{receiptCode}/{receiptType}/{grossWeight}/{tareWeight}/{netWeight}/{materialBatch}") | |
| 113 | + @GetMapping("/add/{id}/{receiptCode}/{receiptType}/{supplierCode}") | |
| 114 | 114 | public String add(@PathVariable("id") Integer id, |
| 115 | 115 | @PathVariable("receiptCode") String receiptCode, |
| 116 | 116 | @PathVariable("receiptType") String receiptType, |
| 117 | - @PathVariable("grossWeight") BigDecimal grossWeight, | |
| 118 | - @PathVariable("tareWeight") BigDecimal tareWeight, | |
| 119 | - @PathVariable("netWeight") BigDecimal netWeight, | |
| 120 | - @PathVariable("materialBatch") String materialBatch, | |
| 117 | + @PathVariable("supplierCode") String supplierCode, | |
| 121 | 118 | ModelMap mmap) { |
| 122 | 119 | LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 123 | 120 | lambdaQueryWrapper.eq(ReceiptHeader::getId, id).eq(ReceiptHeader::getCode, receiptCode); |
| ... | ... | @@ -126,10 +123,7 @@ public class ReceiptDetailController extends BaseController { |
| 126 | 123 | mmap.put("companyCode", receiptHeader.getCompanyCode()); |
| 127 | 124 | mmap.put("receiptCode", receiptCode); |
| 128 | 125 | mmap.put("receiptType", receiptType); |
| 129 | - mmap.put("grossWeight", grossWeight); | |
| 130 | - mmap.put("tareWeight", tareWeight); | |
| 131 | - mmap.put("netWeight", netWeight); | |
| 132 | - mmap.put("materialBatch", materialBatch); | |
| 126 | + mmap.put("supplierCode", supplierCode); | |
| 133 | 127 | |
| 134 | 128 | return prefix + "/add"; |
| 135 | 129 | } |
| ... | ... | @@ -385,4 +379,31 @@ public class ReceiptDetailController extends BaseController { |
| 385 | 379 | return AjaxResult.success("绑定车辆信息成功，"+var+"条记录绑定成功！！"); |
| 386 | 380 | } |
| 387 | 381 | |
| 382 | + @PostMapping("/unbindCar/{ids}") | |
| 383 | + @ResponseBody | |
| 384 | + public AjaxResult unbindCar(@PathVariable("ids")String ids) throws Exception { | |
| 385 | + if (StringUtils.isEmpty(ids)){ | |
| 386 | + return AjaxResult.error("id为空"); | |
| 387 | + } | |
| 388 | + int var = 0; | |
| 389 | + for (Integer id : Convert.toIntArray(ids)){ | |
| 390 | + ReceiptDetail detail = receiptDetailService.getById(id); | |
| 391 | + if(detail == null){ | |
| 392 | + continue; | |
| 393 | + } | |
| 394 | + detail.setMaterialBatch(""); | |
| 395 | + detail.setGrossWeight(BigDecimal.ZERO); | |
| 396 | + detail.setNetWeight(BigDecimal.ZERO); | |
| 397 | + detail.setTareWeight(BigDecimal.ZERO); | |
| 398 | + boolean flag = receiptDetailService.updateById(detail); | |
| 399 | + if(flag){ | |
| 400 | + var++; | |
| 401 | + } | |
| 402 | + } | |
| 403 | + if(var == 0){ | |
| 404 | + return AjaxResult.error("绑定车辆失败请重新绑定"); | |
| 405 | + } | |
| 406 | + return AjaxResult.success("绑定车辆信息成功，"+var+"条记录绑定成功！！"); | |
| 407 | + } | |
| 408 | + | |
| 388 | 409 | } |
| ... | ... |
src/main/resources/templates/receipt/receiptDetail/add.html
| ... | ... | @@ -13,6 +13,7 @@ |
| 13 | 13 | <div class="col-sm-8"> |
| 14 | 14 | <input id="receiptId" name="receiptId" class="form-control" type="text" th:value="${receiptId}" readonly="readonly" > |
| 15 | 15 | <input id="companyCode" name="companyCode" type="hidden" th:value="${companyCode}" > |
| 16 | + <input id="supplierCode" name="supplierCode" type="hidden" th:value="${supplierCode}" > | |
| 16 | 17 | </div> |
| 17 | 18 | </div> |
| 18 | 19 | <div class="form-group"> |
| ... | ... | @@ -40,72 +41,6 @@ |
| 40 | 41 | <input id="totalQty" name="totalQty" class="form-control" value="1" type="text" > |
| 41 | 42 | </div> |
| 42 | 43 | </div> |
| 43 | -<!-- <div class="form-group">--> | |
| 44 | -<!-- <label class="col-sm-3 control-label">电池包重量：</label>--> | |
| 45 | -<!-- <div class="col-sm-8">--> | |
| 46 | -<!-- <input id="batteryPackageWeight" name="batteryPackageWeight" class="form-control" type="text">--> | |
| 47 | -<!-- </div>--> | |
| 48 | -<!-- </div>--> | |
| 49 | - <div class="form-group"> | |
| 50 | - <label class="col-sm-3 control-label">电池包电量：</label> | |
| 51 | - <div class="col-sm-8"> | |
| 52 | - <input id="electricQuantity" name="electricQuantity" class="form-control" type="text"> | |
| 53 | - </div> | |
| 54 | - </div> | |
| 55 | -<!-- <div class="form-group">--> | |
| 56 | -<!-- <div class="form-control-static col-sm-offset-9" style="margin-left: 205px">--> | |
| 57 | -<!-- <button onclick="chooseVehicle()" class="btn btn-primary" type="button">选择车辆入库信息</button>--> | |
| 58 | -<!-- </div>--> | |
| 59 | -<!-- </div>--> | |
| 60 | - <div class="form-group" style="display: none;"> | |
| 61 | - <label class="col-sm-3 control-label">原料批号：</label> | |
| 62 | - <div class="col-sm-8"> | |
| 63 | - <input id="materialBatch" name="materialBatch" th:value="${materialBatch}" class="form-control" type="hidden" readonly="readonly" > | |
| 64 | - </div> | |
| 65 | - </div> | |
| 66 | - <div class="form-group" style="display: none;"> | |
| 67 | - <label class="col-sm-3 control-label">车辆毛重：</label> | |
| 68 | - <div class="col-sm-8"> | |
| 69 | - <input id="grossWeight" name="grossWeight" th:value="${grossWeight}" class="form-control" type="hidden" readonly="readonly"> | |
| 70 | - </div> | |
| 71 | - </div> | |
| 72 | - <div class="form-group" style="display: none;"> | |
| 73 | - <label class="col-sm-3 control-label">车辆皮重：</label> | |
| 74 | - <div class="col-sm-8"> | |
| 75 | - <input id="tareWeight" name="tareWeight" th:value="${tareWeight}" class="form-control" type="hidden" readonly="readonly"> | |
| 76 | - </div> | |
| 77 | - </div> | |
| 78 | - <div class="form-group" style="display: none;"> | |
| 79 | - <label class="col-sm-3 control-label">车辆净重：</label> | |
| 80 | - <div class="col-sm-8"> | |
| 81 | - <input id="netWeight" name="netWeight" th:value="${netWeight}" class="form-control" type="hidden" readonly="readonly"> | |
| 82 | - </div> | |
| 83 | - </div> | |
| 84 | - <div class="form-group"> | |
| 85 | - <label class="col-sm-3 control-label">物料净重：</label> | |
| 86 | - <div class="col-sm-8"> | |
| 87 | - <input id="materialNetWeight" name="materialNetWeight" class="form-control" type="text"> | |
| 88 | - </div> | |
| 89 | - </div> | |
| 90 | - <div class="form-group"> | |
| 91 | - <label class="col-sm-3 control-label">物料毛重：</label> | |
| 92 | - <div class="col-sm-8"> | |
| 93 | - <input id="materialGrossWeight" name="materialGrossWeight" class="form-control" type="text"> | |
| 94 | - </div> | |
| 95 | - </div> | |
| 96 | - <div class="form-group"> | |
| 97 | - <label class="col-sm-3 control-label">物料皮重：</label> | |
| 98 | - <div class="col-sm-8"> | |
| 99 | - <input id="materialTareWeight" name="materialTareWeight" class="form-control" type="text"> | |
| 100 | - </div> | |
| 101 | - </div> | |
| 102 | - | |
| 103 | - <!--<div class="form-group">--> | |
| 104 | - <!--<label class="col-sm-3 control-label">供应商编码：</label>--> | |
| 105 | - <!--<div class="col-sm-8">--> | |
| 106 | - <!--<input id="supplierCode" name="supplierCode" class="form-control" type="text">--> | |
| 107 | - <!--</div>--> | |
| 108 | - <!--</div>--> | |
| 109 | 44 | <div class="form-group"> |
| 110 | 45 | <label class="col-sm-3 control-label">订单号 ：</label> |
| 111 | 46 | <div class="col-sm-8"> |
| ... | ... | @@ -118,190 +53,9 @@ |
| 118 | 53 | <input id="batch" name="batch" class="form-control" type="text"> |
| 119 | 54 | </div> |
| 120 | 55 | </div> |
| 121 | - <div class="form-group"> | |
| 122 | - <label class="col-sm-3 control-label">单位1：</label> | |
| 123 | - <div class="col-sm-8"> | |
| 124 | - <input id="unitId1" name="unitId1" class="form-control" type="text"> | |
| 125 | - </div> | |
| 126 | - </div> | |
| 127 | - <div class="form-group"> | |
| 128 | - <label class="col-sm-3 control-label">单位2：</label> | |
| 129 | - <div class="col-sm-8"> | |
| 130 | - <input id="unitId2" name="unitId2" class="form-control" type="text"> | |
| 131 | - </div> | |
| 132 | - </div> | |
| 133 | - <div class="form-group"> | |
| 134 | - <label class="col-sm-3 control-label">1->2转换倍数：</label> | |
| 135 | - <div class="col-sm-8"> | |
| 136 | - <input id="multiple" name="multiple" class="form-control" type="text"> | |
| 137 | - </div> | |
| 138 | - </div> | |
| 139 | - <div class="form-group"> | |
| 140 | - <label class="col-sm-3 control-label">单位1对应数量：</label> | |
| 141 | - <div class="col-sm-8"> | |
| 142 | - <input id="unitId1Qty" name="unitId1Qty" class="form-control" type="text"> | |
| 143 | - </div> | |
| 144 | - </div> | |
| 145 | - <div class="form-group"> | |
| 146 | - <label class="col-sm-3 control-label">单位2对应数量：</label> | |
| 147 | - <div class="col-sm-8"> | |
| 148 | - <input id="unitId2Qty" name="unitId2Qty" class="form-control" type="text"> | |
| 149 | - </div> | |
| 150 | - </div> | |
| 151 | - | |
| 152 | - <!--<div class="form-group"> | |
| 153 | - <label class="col-sm-3 control-label">来源企业名称：</label> | |
| 154 | - <div class="col-sm-8"> | |
| 155 | - <input id="sourceEnterpriseName" name="sourceEnterpriseName" class="form-control" type="text"> | |
| 156 | - </div> | |
| 157 | - </div>--> | |
| 158 | - <!--<div class="form-group"> | |
| 159 | - <label class="col-sm-3 control-label">来源企业名称统一社会信用代码：</label> | |
| 160 | - <div class="col-sm-8"> | |
| 161 | - <input id="sourceEnterpriseCode" name="sourceEnterpriseCode" class="form-control" type="text"> | |
| 162 | - </div> | |
| 163 | - </div>--> | |
| 164 | - <!--<div class="form-group"> | |
| 165 | - <label class="col-sm-3 control-label">电池质量（kg）：</label> | |
| 166 | - <div class="col-sm-8"> | |
| 167 | - <input id="batteryQuality" name="batteryQuality" class="form-control" type="text"> | |
| 168 | - </div> | |
| 169 | - </div>--> | |
| 170 | - <div class="form-group"> | |
| 171 | - <label class="col-sm-3 control-label">电池产品类型：</label> | |
| 172 | - <div class="col-sm-8"> | |
| 173 | - <select id="batteryType" name="batteryType" class="form-control" type="text"> | |
| 174 | - <option value="1">电池包</option> | |
| 175 | - <option value="2">电池模块</option> | |
| 176 | - <option value="3">电池单体</option> | |
| 177 | - </select> | |
| 178 | - </div> | |
| 179 | - </div> | |
| 180 | - <div class="form-group"> | |
| 181 | - <label class="col-sm-3 control-label">电池编码：</label> | |
| 182 | - <div class="col-sm-8"> | |
| 183 | - <input id="batteryCode" name="batteryCode" class="form-control" type="text"> | |
| 184 | - </div> | |
| 185 | - </div> | |
| 186 | - | |
| 187 | - <!--<div class="form-group"> | |
| 188 | - <label class="col-sm-3 control-label">电池包二维码：</label> | |
| 189 | - <div class="col-sm-8"> | |
| 190 | - <input id="batteryPackTwoCode" name="batteryPackTwoCode" class="form-control" type="text"> | |
| 191 | - </div> | |
| 192 | - </div>--> | |
| 193 | - <div class="form-group"> | |
| 194 | - <label class="col-sm-3 control-label">回收日期：</label> | |
| 195 | - <div class="col-sm-8"> | |
| 196 | - <input id="recoveryDate" name="recoveryDate" class="form-control" type="text"> | |
| 197 | - </div> | |
| 198 | - </div> | |
| 199 | - <div class="form-group"> | |
| 200 | - <label class="col-sm-3 control-label">回收人：</label> | |
| 201 | - <div class="col-sm-8"> | |
| 202 | - <input id="recycler" name="recycler" class="form-control" type="text"> | |
| 203 | - </div> | |
| 204 | - </div> | |
| 205 | -<!-- <div class="form-group">--> | |
| 206 | -<!-- <label class="col-sm-3 control-label">生产日期：</label>--> | |
| 207 | -<!-- <div class="col-sm-8">--> | |
| 208 | -<!-- <input id="manufactureData" name="manufactureData" class="form-control" type="text">--> | |
| 209 | -<!-- </div>--> | |
| 210 | -<!-- </div>--> | |
| 211 | - <div class="form-group"> | |
| 212 | - <label class="col-sm-3 control-label">厂家编码1：</label> | |
| 213 | - <div class="col-sm-8"> | |
| 214 | - <input id="manufacturerOneCode" name="manufacturerOneCode" class="form-control" type="text"> | |
| 215 | - </div> | |
| 216 | - </div> | |
| 217 | - <div class="form-group"> | |
| 218 | - <label class="col-sm-3 control-label">厂家编码2：</label> | |
| 219 | - <div class="col-sm-8"> | |
| 220 | - <input id="manufacturerTwoCode" name="manufacturerTwoCode" class="form-control" type="text"> | |
| 221 | - </div> | |
| 222 | - </div> | |
| 223 | - <div class="form-group"> | |
| 224 | - <label class="col-sm-3 control-label">电池包种类：</label> | |
| 225 | - <div class="col-sm-8"> | |
| 226 | - <!--<input id="batteryPackType" name="batteryPackType" class="form-control" type="text"> | |
| 227 | - --> | |
| 228 | - <select id="batteryPackType" name="batteryPackType" class="form-control" th:with="batteryPackType=${@dict.getType('batteryPackType')}"> | |
| 229 | - <option value="">请选择</option> | |
| 230 | - <option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
| 231 | - </select> | |
| 232 | - </div> | |
| 233 | - </div> | |
| 234 | - <div class="form-group"> | |
| 235 | - <label class="col-sm-3 control-label">完整程度：</label> | |
| 236 | - <div class="col-sm-8"> | |
| 237 | - <select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}"> | |
| 238 | - <option value="">请选择</option> | |
| 239 | - <option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
| 240 | - </select> | |
| 241 | - </div> | |
| 242 | - </div> | |
| 243 | - <div class="form-group"> | |
| 244 | - <label class="col-sm-3 control-label">入库货架：</label> | |
| 245 | - <div class="col-sm-8"> | |
| 246 | - <input id="storageShelf" name="storageShelf" class="form-control" type="text"> | |
| 247 | - </div> | |
| 248 | - </div> | |
| 249 | 56 | |
| 250 | 57 | |
| 251 | 58 | <div class="form-group"> |
| 252 | - <label class="col-sm-3 control-label">入库仓库：</label> | |
| 253 | - <div class="col-sm-8"> | |
| 254 | - <input id="receiptWarehouse" name="receiptWarehouse" class="form-control" type="text"> | |
| 255 | - </div> | |
| 256 | - </div> | |
| 257 | - | |
| 258 | - | |
| 259 | - <div class="form-group"> | |
| 260 | - <label class="col-sm-3 control-label">国家编码：</label> | |
| 261 | - <div class="col-sm-8"> | |
| 262 | - <input id="countryCode" name="countryCode" class="form-control" type="text"> | |
| 263 | - </div> | |
| 264 | - </div> | |
| 265 | - <div class="form-group"> | |
| 266 | - <label class="col-sm-3 control-label">电池类型：</label> | |
| 267 | - <div class="col-sm-8"> | |
| 268 | - <select id="batteryTypes" name="batteryTypes" class="form-control" th:with="batteryType=${@dict.getType('batteryType')}"> | |
| 269 | - <option value="">请选择</option> | |
| 270 | - <option th:each="dict : ${batteryType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
| 271 | - </select> | |
| 272 | - </div> | |
| 273 | - </div> | |
| 274 | - <!--<div class="form-group"> | |
| 275 | - <label class="col-sm-3 control-label">入库时间：</label> | |
| 276 | - <div class="col-sm-8"> | |
| 277 | - <input id="receiptDate" name="receiptDate" class="form-control" type="text"> | |
| 278 | - </div> | |
| 279 | - </div>--> | |
| 280 | - <!--<div class="form-group"> | |
| 281 | - <label class="col-sm-3 control-label">入库质量（kg）：</label> | |
| 282 | - <div class="col-sm-8"> | |
| 283 | - <input id="receiptWeight" name="receiptWeight" class="form-control" type="text"> | |
| 284 | - </div> | |
| 285 | - </div>--> | |
| 286 | - <!--<div class="form-group"> | |
| 287 | - <label class="col-sm-3 control-label">电池个数：</label> | |
| 288 | - <div class="col-sm-8"> | |
| 289 | - <input id="batteryQty" name="batteryQty" class="form-control" type="text"> | |
| 290 | - </div> | |
| 291 | - </div>--> | |
| 292 | - <!--<div class="form-group"> | |
| 293 | - <label class="col-sm-3 control-label">旧电池来源：</label> | |
| 294 | - <div class="col-sm-8"> | |
| 295 | - <input id="oldBatterySource" name="oldBatterySource" class="form-control" type="text"> | |
| 296 | - </div> | |
| 297 | - </div> | |
| 298 | - <div class="form-group"> | |
| 299 | - <label class="col-sm-3 control-label">统一社会信用代码：</label> | |
| 300 | - <div class="col-sm-8"> | |
| 301 | - <input id="allCreditCode" name="allCreditCode" class="form-control" type="text"> | |
| 302 | - </div> | |
| 303 | - </div>--> | |
| 304 | - <div class="form-group"> | |
| 305 | 59 | <label class="col-sm-3 control-label">批号：</label> |
| 306 | 60 | <div class="col-sm-8"> |
| 307 | 61 | <input id="lot" name="lot" class="form-control" type="text"> |
| ... | ... | @@ -388,18 +142,6 @@ |
| 388 | 142 | receiptType:{ |
| 389 | 143 | required:true |
| 390 | 144 | }, |
| 391 | - grossWeight:{ | |
| 392 | - required:true | |
| 393 | - }, | |
| 394 | - tareWeight:{ | |
| 395 | - required:true | |
| 396 | - }, | |
| 397 | - netWeight:{ | |
| 398 | - required:true | |
| 399 | - }, | |
| 400 | - materialBatch:{ | |
| 401 | - required:true | |
| 402 | - }, | |
| 403 | 145 | materialCode:{ |
| 404 | 146 | required:true |
| 405 | 147 | }, |
| ... | ... | @@ -465,11 +207,6 @@ |
| 465 | 207 | }); |
| 466 | 208 | }); |
| 467 | 209 | |
| 468 | - function chooseVehicle(){ | |
| 469 | - var url = ctx + "vehicle/vehicleReceipt/listVehicleReceipt"; | |
| 470 | - $.modal.open("选择车辆入库信息", url); | |
| 471 | - } | |
| 472 | - | |
| 473 | 210 | $("#dateTime").datetimepicker({ |
| 474 | 211 | language: 'zh-CN',//语言 |
| 475 | 212 | format: 'yyyy-mm-dd hh:ii:ss', //String 默认值: 'mm/dd/yyyy'日期转换格式 |
| ... | ... |
src/main/resources/templates/receipt/receiptHeader/add.html
| ... | ... | @@ -43,36 +43,36 @@ |
| 43 | 43 | <!-- </div>--> |
| 44 | 44 | <!-- </div>--> |
| 45 | 45 | |
| 46 | - <div class="form-group"> | |
| 47 | - <div class="form-control-static col-sm-offset-9" style="margin-left: 205px"> | |
| 48 | - <button onclick="chooseVehicle()" class="btn btn-primary" type="button">选择车辆入库信息</button> | |
| 49 | - </div> | |
| 50 | - </div> | |
| 46 | +<!-- <div class="form-group">--> | |
| 47 | +<!-- <div class="form-control-static col-sm-offset-9" style="margin-left: 205px">--> | |
| 48 | +<!-- <button onclick="chooseVehicle()" class="btn btn-primary" type="button">选择车辆入库信息</button>--> | |
| 49 | +<!-- </div>--> | |
| 50 | +<!-- </div>--> | |
| 51 | 51 | |
| 52 | - <div class="form-group"> | |
| 53 | - <label class="col-sm-3 control-label">原料批号：</label> | |
| 54 | - <div class="col-sm-8"> | |
| 55 | - <input id="materialBatch" name="materialBatch" class="form-control" type="text" value="0" readonly="readonly"> | |
| 56 | - </div> | |
| 57 | - </div> | |
| 58 | - <div class="form-group"> | |
| 59 | - <label class="col-sm-3 control-label">车辆毛重：</label> | |
| 60 | - <div class="col-sm-8"> | |
| 61 | - <input id="grossWeight" name="grossWeight" class="form-control" type="text" readonly="readonly"> | |
| 62 | - </div> | |
| 63 | - </div> | |
| 64 | - <div class="form-group"> | |
| 65 | - <label class="col-sm-3 control-label">车辆皮重：</label> | |
| 66 | - <div class="col-sm-8"> | |
| 67 | - <input id="tareWeight" name="tareWeight" class="form-control" type="text" readonly="readonly"> | |
| 68 | - </div> | |
| 69 | - </div> | |
| 70 | - <div class="form-group"> | |
| 71 | - <label class="col-sm-3 control-label">车辆净重：</label> | |
| 72 | - <div class="col-sm-8"> | |
| 73 | - <input id="netWeight" name="netWeight" class="form-control" type="text" readonly="readonly"> | |
| 74 | - </div> | |
| 75 | - </div> | |
| 52 | +<!-- <div class="form-group">--> | |
| 53 | +<!-- <label class="col-sm-3 control-label">原料批号：</label>--> | |
| 54 | +<!-- <div class="col-sm-8">--> | |
| 55 | +<!-- <input id="materialBatch" name="materialBatch" class="form-control" type="text" value="0" readonly="readonly">--> | |
| 56 | +<!-- </div>--> | |
| 57 | +<!-- </div>--> | |
| 58 | +<!-- <div class="form-group">--> | |
| 59 | +<!-- <label class="col-sm-3 control-label">车辆毛重：</label>--> | |
| 60 | +<!-- <div class="col-sm-8">--> | |
| 61 | +<!-- <input id="grossWeight" name="grossWeight" class="form-control" type="text" readonly="readonly">--> | |
| 62 | +<!-- </div>--> | |
| 63 | +<!-- </div>--> | |
| 64 | +<!-- <div class="form-group">--> | |
| 65 | +<!-- <label class="col-sm-3 control-label">车辆皮重：</label>--> | |
| 66 | +<!-- <div class="col-sm-8">--> | |
| 67 | +<!-- <input id="tareWeight" name="tareWeight" class="form-control" type="text" readonly="readonly">--> | |
| 68 | +<!-- </div>--> | |
| 69 | +<!-- </div>--> | |
| 70 | +<!-- <div class="form-group">--> | |
| 71 | +<!-- <label class="col-sm-3 control-label">车辆净重：</label>--> | |
| 72 | +<!-- <div class="col-sm-8">--> | |
| 73 | +<!-- <input id="netWeight" name="netWeight" class="form-control" type="text" readonly="readonly">--> | |
| 74 | +<!-- </div>--> | |
| 75 | +<!-- </div>--> | |
| 76 | 76 | <div class="form-group"> |
| 77 | 77 | <div class="form-control-static col-sm-offset-9"> |
| 78 | 78 | <button type="submit" class="btn btn-primary" >提交</button> |
| ... | ... | @@ -103,7 +103,7 @@ |
| 103 | 103 | data : { |
| 104 | 104 | "receiptType": $("#receiptType option:selected").val(), |
| 105 | 105 | "companyCode": $("#companyCode option:selected").val(), |
| 106 | - // "supplierCode": $("input[name='supplierCode']").val(), | |
| 106 | + "supplierCode": $("#supplierCode option:selected").val(), | |
| 107 | 107 | "receiptNote": $("input[name='receiptNote']").val(), |
| 108 | 108 | "grossWeight": $("input[name='grossWeight']").val(), |
| 109 | 109 | "tareWeight": $("input[name='tareWeight']").val(), |
| ... | ... | @@ -142,10 +142,10 @@ |
| 142 | 142 | }); |
| 143 | 143 | }) |
| 144 | 144 | |
| 145 | - function chooseVehicle(){ | |
| 146 | - var url = ctx + "vehicle/vehicleReceipt/listVehicleReceipt"; | |
| 147 | - $.modal.open("选择车辆入库信息", url); | |
| 148 | - } | |
| 145 | + // function chooseVehicle(){ | |
| 146 | + // var url = ctx + "vehicle/vehicleReceipt/listVehicleReceipt"; | |
| 147 | + // $.modal.open("选择车辆入库信息", url); | |
| 148 | + // } | |
| 149 | 149 | </script> |
| 150 | 150 | </body> |
| 151 | 151 | </html> |
| ... | ... |
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
| ... | ... | @@ -202,14 +202,17 @@ |
| 202 | 202 | <a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()" shiro:hasPermission="receipt:receiptDetail:remove"> |
| 203 | 203 | <i class="fa fa-trash-o"></i> 删除 |
| 204 | 204 | </a> |
| 205 | - <a class="btn btn-outline btn-success btn-rounded" onclick="receiptDetailPrint()" shiro:hasPermission="shipment:bill:report"> | |
| 206 | - <i class="fa fa-print"></i> 打印 | |
| 207 | - </a> | |
| 208 | - <!--<a class="btn btn-outline btn-success btn-rounded" onclick="batteryPackagePrint()" shiro:hasPermission="shipment:bill:report"> | |
| 205 | +<!-- <a class="btn btn-outline btn-success btn-rounded" onclick="receiptDetailPrint()" shiro:hasPermission="shipment:bill:report">--> | |
| 206 | +<!-- <i class="fa fa-print"></i> 打印--> | |
| 207 | +<!-- </a>--> | |
| 208 | + <a class="btn btn-outline btn-success btn-rounded" onclick="batteryPackagePrint()" shiro:hasPermission="shipment:bill:report"> | |
| 209 | 209 | <i class="fa fa-print"></i> 电池包打印 |
| 210 | - </a>--> | |
| 210 | + </a> | |
| 211 | 211 | <a class="btn btn-outline btn-success btn-rounded" onclick="bindCar()" > |
| 212 | - <i class="fa fa-print"></i> 绑定车辆 | |
| 212 | + <i class="fa fa-lock"></i> 绑定车辆 | |
| 213 | + </a> | |
| 214 | + <a class="btn btn-outline btn-success btn-rounded" onclick="unbindCar()" > | |
| 215 | + <i class="fa fa-unlock"></i> 解绑 | |
| 213 | 216 | </a> |
| 214 | 217 | <a class="btn btn-outline btn-primary btn-rounded" onclick="Toreceiving(receiptCode)"> |
| 215 | 218 | <i class="fa fa-cart-plus"></i> 收货 |
| ... | ... | @@ -244,14 +247,12 @@ |
| 244 | 247 | var isVirtualBoms = [[${@dict.getType('isVirtualBom')}]]; |
| 245 | 248 | var receiptId = ''; |
| 246 | 249 | var receiptCode = ''; |
| 250 | + var supplierCode = ''; | |
| 247 | 251 | let status = [[${status}]]; |
| 248 | 252 | var statusFirst = [[${statusFirst}]]; |
| 249 | 253 | var statusLast = [[${statusLast}]]; |
| 250 | 254 | var receiptType = ''; |
| 251 | - var grossWeight = ''; | |
| 252 | - var tareWeight = ''; | |
| 253 | - var netWeight = ''; | |
| 254 | - var materialBatch = ''; | |
| 255 | + var supplierCode = ''; | |
| 255 | 256 | |
| 256 | 257 | $(function() { |
| 257 | 258 | var options = { |
| ... | ... | @@ -265,7 +266,7 @@ |
| 265 | 266 | search: false, |
| 266 | 267 | pageSize: 10, |
| 267 | 268 | onDblClickRow: function (row, value, index) { |
| 268 | - detail(row.id, row.code); | |
| 269 | + detail(row.id, row.code,row.receiptType,row.supplierCode); | |
| 269 | 270 | }, |
| 270 | 271 | columns: [{ |
| 271 | 272 | checkbox: true |
| ... | ... | @@ -683,6 +684,10 @@ |
| 683 | 684 | visible:false |
| 684 | 685 | }, |
| 685 | 686 | { |
| 687 | + field : 'electricQuantity', | |
| 688 | + title : '电池包电量' | |
| 689 | + }, | |
| 690 | + { | |
| 686 | 691 | field : 'totalQty', |
| 687 | 692 | title : '总数量' |
| 688 | 693 | }, |
| ... | ... | @@ -694,10 +699,7 @@ |
| 694 | 699 | // field : 'batteryPackageWeight', |
| 695 | 700 | // title : '电池包重量' |
| 696 | 701 | // }, |
| 697 | - { | |
| 698 | - field : 'electricQuantity', | |
| 699 | - title : '电池包电量' | |
| 700 | - }, | |
| 702 | + | |
| 701 | 703 | { |
| 702 | 704 | field : 'openWeight', |
| 703 | 705 | title : '已收重量', |
| ... | ... | @@ -796,14 +798,11 @@ |
| 796 | 798 | }); |
| 797 | 799 | |
| 798 | 800 | /* 入库单列表-详细 */ |
| 799 | - function detail(id, code,receiptType,grossWeight,netWeight,tareWeight,materialBatch) { | |
| 801 | + function detail(id, code,receiptTypes,supplierCodes) { | |
| 800 | 802 | receiptId = id; |
| 801 | 803 | receiptCode=code; |
| 802 | - receiptType=receiptType; | |
| 803 | - grossWeight=grossWeight; | |
| 804 | - netWeight=netWeight; | |
| 805 | - tareWeight=tareWeight; | |
| 806 | - materialBatch=materialBatch; | |
| 804 | + receiptType=receiptTypes; | |
| 805 | + supplierCode=supplierCodes; | |
| 807 | 806 | |
| 808 | 807 | |
| 809 | 808 | $("#myTab li").removeClass("active"); |
| ... | ... | @@ -885,7 +884,7 @@ |
| 885 | 884 | } |
| 886 | 885 | else { |
| 887 | 886 | table.set("bootstrap-table1"); |
| 888 | - var url = detailPrefix + "/add/" + receiptId + "/" + receiptCode+ "/" +receiptType+ "/" +grossWeight+ "/" +tareWeight+ "/" +netWeight+ "/" +materialBatch; | |
| 887 | + var url = detailPrefix + "/add/" + receiptId + "/" + receiptCode+ "/" +receiptType+ "/" +supplierCode; | |
| 889 | 888 | $.modal.open("添加" + table.options.modalName, url); |
| 890 | 889 | } |
| 891 | 890 | } |
| ... | ... | @@ -1011,6 +1010,33 @@ |
| 1011 | 1010 | }) |
| 1012 | 1011 | } |
| 1013 | 1012 | |
| 1013 | + function unbindCar(){ | |
| 1014 | + var rows=$("#bootstrap-table1").bootstrapTable('getSelections'); | |
| 1015 | + if (rows.length == 0) { | |
| 1016 | + $.modal.alertWarning("请至少选择一条记录"); | |
| 1017 | + return; | |
| 1018 | + } | |
| 1019 | + $.modal.confirm("确认要解除绑定选中的" + rows.length + "条数据吗?", function() { | |
| 1020 | + var ids = ""; | |
| 1021 | + for(var i=0; i<rows.length; i++) { | |
| 1022 | + ids = ids + rows[i].id + "," | |
| 1023 | + } | |
| 1024 | + var url = ctx + "receipt/receiptDetail/unbindCar/"+ids.substring(0, ids.length-1); | |
| 1025 | + var config = { | |
| 1026 | + url: url, | |
| 1027 | + type: "post", | |
| 1028 | + dataType: "json", | |
| 1029 | + success: function (result) { | |
| 1030 | + if(result.code==web_status.SUCCESS){ | |
| 1031 | + $.modal.msgSuccess(result.msg); | |
| 1032 | + loadDetail(); | |
| 1033 | + } | |
| 1034 | + } | |
| 1035 | + }; | |
| 1036 | + $.ajax(config) | |
| 1037 | + }) | |
| 1038 | + } | |
| 1039 | + | |
| 1014 | 1040 | |
| 1015 | 1041 | /* 收货 */ |
| 1016 | 1042 | function Toreceiving(code) { |
| ... | ... |