Browse Source

[fix]生产管理:

修改生产订单详情 table表格不能自适应窗口问题
修改 领料页面 table表格不能自适应窗口问题
修复 领料保存出现空指针异常问题
修改 领料添加的后端代码
dev
liuxiaoxu 5 months ago
parent
commit
c9bd782b46
  1. 4
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderPickController.java
  2. 2
      ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
  3. 9
      ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html

4
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderPickController.java

@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.system.domain.SysMakeorderPick; import com.ruoyi.system.domain.SysMakeorderPick;
@ -106,6 +107,9 @@ public class SysMakeorderPickController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult addSave(SysMakeorderPick sysMakeorderPick) public AjaxResult addSave(SysMakeorderPick sysMakeorderPick)
{ {
if (StringUtils.isEmpty(sysMakeorderPick.getPickDetails())){
return AjaxResult.success();
}
// 审核状态-待审核 // 审核状态-待审核
sysMakeorderPick.setAuditStatus("0"); sysMakeorderPick.setAuditStatus("0");
sysMakeorderPickService.submitApply(sysMakeorderPick); sysMakeorderPickService.submitApply(sysMakeorderPick);

2
ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html

@ -356,9 +356,7 @@
}); });
function submitHandler() { function submitHandler() {
debugger
var data = $("#form-makeorder-edit").serializeArray(); var data = $("#form-makeorder-edit").serializeArray();
alert(JSON.stringify(data));
$.operate.save(ctx + "system/makeorderpick/add", data); $.operate.save(ctx + "system/makeorderpick/add", data);
} }

9
ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html

@ -36,12 +36,13 @@
</div> </div>
</div> </div>
<div class="row"> <div class="container">
<div class="col-sm-12 select-table table-striped"> <div class="row">
<table id="bootstrap-sub-table-1"></table> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-sub-table-1"></table>
</div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />

Loading…
Cancel
Save