Skip to content

T
topsun-bpm
Commit 0cb62a27 authored by 全洪江's avatar 全洪江
Browse files
Options

金库销售订单接口

parent 68a5d03d
Hide whitespace changes
Inline Side-by-side
Showing with 455 additions and 22 deletions
topsun-xt/src/main/webapp/biz/topsun/customer/customerDetail.jsp
View file @ 0cb62a27
......@@ -107,7 +107,7 @@
<x:inputC name="signedStyle" label="货单签回方式" required="true" labelCol="1" fieldCol="2"/><%--sap、金库--%>
<x:selectC name="shipMethod" label="出货方式" required="true" dictionary="shipMethod" labelCol="1" fieldCol="2"/><%--sap、金库--%>
<x:selectC name="route" label="路线" required="true" dictionary="route" labelCol="1" fieldCol="2"/><%--sap、金库--%>
<x:selectC name="ZF12" label="送货单打印默认设置" required="true" labelCol="1" fieldCol="2"/><%--sap--%>
<x:inputC name="ZF12" label="送货单打印默认设置" required="true" labelCol="1" fieldCol="2"/><%--sap--%>
<x:inputC name="shipAbnormalDeadline" label="送货单统计异常期限" required="true" labelCol="1" fieldCol="2"/><%--sap、金库--%>
<x:inputC name="productionDeliveryMethod" label="生产发货方式" labelCol="1" fieldCol="2" required="true"/><%--sap、金库--%>
<x:inputC name="monthlySettlementMethod" label="月结方式" id="selectedMonthlySettlementMethod" wrapper="select" required="true" labelCol="1" fieldCol="2"/><%--sap、金库--%>
......
topsun-xt/src/main/webapp/biz/topsun/customer/customerList.jsp
View file @ 0cb62a27
......@@ -11,10 +11,6 @@
<body>
<div class="container-fluid">
<div class="ui-hide">
<x:select name="processType" dictionary="processType"/>
<x:select name="yesorno" dictionary="yesorno"/>
</div>
<div id="layout">
<div position="center" title="客户信息管理">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/salesOrder/salesOrderItem.jsp 0 → 100644
View file @ 0cb62a27
<%--
Created by IntelliJ IDEA.
User: Adim
Date: 2024/1/8
Time: 19:28
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Title</title>
</head>
<body>
</body>
</html>
topsun-xt/src/main/webapp/biz/topsun/sap/salesOrder/salesOrderList.js 0 → 100644
View file @ 0cb62a27
var gridManager = null;
$(document).ready(function () {
initializateUI();
loadSalesOrderListGrid();
});
function initializateUI() {
UICtrl.layout("#layout", {leftWidth: 3});
}
function loadSalesOrderListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
addHandler();
},
updateHandler: function () {
updateHandler();
},
deleteHandler: deleteHandler,
});
gridManager = UICtrl.grid("#salesOrderListGrid", {
columns: [
{display: "销售单号", name: "salesOrderCode", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "订单类型", name: "salesOrderType", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "客户", name: "salesOrderCustomer", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "客户单号", name: "salesOrderCustomerCode", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "下单日期", name: "salesOrderDate", width: 160, minWidth: 60, type: "string", align: "left"},
{display: "交易币别", name: "salesOrderCurrency", width: 120, minWidth: 60, type: "datetime", align: "left"},
{display: "交易倍数", name: "salesOrderMultiple", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "款式", name: "salesOrderStyle", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申购/采购单号", name: "salesOrderProcureCode", width: 160, minWidth: 60, type: "string", align: "left"},
{display: "跟单员", name: "salesOrderMerchandiser", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "备注", name: "salesOrderRemarks", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "创建时间", name: "salesOrderCreateTime", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "创建人", name: "salesOrderCreator", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "审批时间", name: "salesOrderApprovalTime", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "审核人", name: "salesOrderReviewer", width: 120, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/customer/findCustomer.ajax',
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
width: "100%",
height: "100%",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow: function (data, rowindex, rowobj) {
updateHandler(data);
}
});
UICtrl.setSearchAreaToggle(gridManager);
}
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
}
function reloadGrid() {
gridManager.loadData();
}
function resetForm(obj) {
$(obj).formClean();
}
//增加按钮
function addHandler() {
UICtrl.addTabItem({
tabid: 'addCustomerDetail',
text: '添加客户详细信息',
url: web_app.name + '/customer/addCustomerDetail.do'
})
}
//删除按钮
function deleteHandler() {
DataUtil.del({
action: 'customer/deleteCustomerAndAffiliatedInfoByCustomerId.ajax',
gridManager: gridManager, idFieldName: 'customerId',
onSuccess: function () {
reloadGrid();
}
});
}
//修改按钮
function updateHandler(data) {
if (!data) {
data = DataUtil.getUpdateRow(gridManager);
if(!data) {
return;
}
}
UICtrl.addTabItem({
tabid: 'customerDetail' + data.customerId,
text: '客户详细信息',
url: web_app.name + '/customer/forwardCustomerDetail.do?customerId=' + data.customerId
})
}
topsun-xt/src/main/webapp/biz/topsun/sap/salesOrder/salesOrder.jsp → topsun-xt/src/main/webapp/biz/topsun/sap/salesOrder/salesOrderList.jsp
View file @ 0cb62a27
......@@ -6,9 +6,16 @@
<x:base include="layout,dialog,grid,tree,dateTime,combox,commonTree"/>
<x:script src='/system/opm/js/OpmUtil.js'/>
<x:script src='/biz/topsun/common/purchaseCommon.js'/>
<x:script src='/biz/topsun/customer/customerDetail.js'/>
<x:script src='/biz/topsun/sap/salesOrder/salesOrderList.js'/>
</head>
<body>
<div class="container-fluid">
<div id="layout">
<div position="center" title="销售订单管理">
<div class="blank_div clearfix"></div>
<div id="salesOrderListGrid" style="margin: 2px;"></div>
</div>
</div>
</div>
</body>
</html>
topsun/src/main/java/com/huigou/topsun/sap/salesOrder/application/impl/SapSalesOrderApplicationImpl.java
View file @ 0cb62a27
......@@ -25,7 +25,12 @@ public class SapSalesOrderApplicationImpl extends FlowBroker implements SapSales
@Override
public void saveSalesOrder(SapSalesOrder sapSalesOrder, SapSalesOrderItem sapSalesOrderItem, SapSalesOrderOtherInfo sapSalesOrderOtherInfo) {
SapSalesOrder saveSapSalesOrder = sapSalesOrderRepository.saveAndFlush(sapSalesOrder);
String salesOrderId = saveSapSalesOrder.getSalesOrderId();
sapSalesOrderItem.setSalesOrderId(salesOrderId);
SapSalesOrderItem saveSapSalesOrderItem = sapSalesOrderItemRepository.saveAndFlush(sapSalesOrderItem);
String salesOrderItemId = saveSapSalesOrderItem.getSalesOrderItemId();
sapSalesOrderOtherInfo.setSalesOrderItemId(salesOrderItemId);
sapSalesOrderOtherInfo.setSalesOrderId(salesOrderId);
SapSalesOrderOtherInfo saveSapSalesOrderOtherInfo = sapSalesOrderOtherInfoRepository.saveAndFlush(sapSalesOrderOtherInfo);
}
}
topsun/src/main/java/com/huigou/topsun/sap/salesOrder/controller/SapSalesOrderController.java
View file @ 0cb62a27
......@@ -4,13 +4,16 @@ import com.huigou.topsun.sap.salesOrder.application.SapSalesOrderApplication;
import com.huigou.topsun.sap.salesOrder.domain.SapSalesOrder;
import com.huigou.topsun.sap.salesOrder.domain.SapSalesOrderItem;
import com.huigou.topsun.sap.salesOrder.domain.SapSalesOrderOtherInfo;
import com.huigou.topsun.sap.salesOrder.domain.dto.SalesOrderItemDto;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.annotation.SkipAuth;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.util.Optional;
@Controller
@ControllerMapping("/sapSalesOrder")
......@@ -23,12 +26,26 @@ public class SapSalesOrderController extends CommonController {
return "/biz/topsun/sap/salesOrder/";
}
public void saveSalesOrder() {
SDO sdo = getSDO();
public String forwardSalesOrderList() {
return forward("salesOrderList");
}
@SkipAuth
// @RequestMapping(value = "/json",method = RequestMethod.POST,produces = "application/json;charset=UTF-8")
// @ResponseBody
// @RequestBody SalesOrderItemDto salesOrderItemDto
public String saveSalesOrder() {
SDO sdo = getUploadSDO();
SapSalesOrder sapSalesOrder = sdo.toObject(SapSalesOrder.class);
SapSalesOrderItem sapSalesOrderItem = sdo.toObject(SapSalesOrderItem.class);
SapSalesOrderOtherInfo sapSalesOrderOtherInfo = sdo.toObject(SapSalesOrderOtherInfo.class);
// SapSalesOrder sapSalesOrder = new SapSalesOrder();
// SapSalesOrderItem sapSalesOrderItem = new SapSalesOrderItem();
// SapSalesOrderOtherInfo sapSalesOrderOtherInfo = new SapSalesOrderOtherInfo();
// BeanUtils.copyProperties(salesOrderItemDto,sapSalesOrder);
// BeanUtils.copyProperties(salesOrderItemDto,sapSalesOrderItem);
// BeanUtils.copyProperties(salesOrderItemDto,sapSalesOrderOtherInfo);
sapSalesOrderApplication.saveSalesOrder(sapSalesOrder,sapSalesOrderItem,sapSalesOrderOtherInfo);
return success();
}
......
topsun/src/main/java/com/huigou/topsun/sap/salesOrder/domain/SapSalesOrderItem.java
View file @ 0cb62a27
......@@ -154,8 +154,8 @@ public class SapSalesOrderItem implements Serializable {
/**
* 销线
*/
@Column(name = "sales_order_item_seles_line")
private String salesOrderItemSelesLine;
@Column(name = "sales_order_item_sales_line")
private String salesOrderItemSalesLine;
/**
* 产品规格
......@@ -184,8 +184,8 @@ public class SapSalesOrderItem implements Serializable {
/**
* 销售订单明细表备注
*/
@Column(name = "seles_order_item_remarks")
private String selesOrderItemRemarks;
@Column(name = "sales_order_item_remarks")
private String salesOrderItemRemarks;
/**
* 签收人
......@@ -208,8 +208,8 @@ public class SapSalesOrderItem implements Serializable {
/**
* 印刷方向
*/
@Column(name = "sales_order_itme_print_direction")
private String salesOrderItmePrintDirection;
@Column(name = "sales_order_item_print_direction")
private String salesOrderItemPrintDirection;
/**
* 单价
......@@ -220,8 +220,8 @@ public class SapSalesOrderItem implements Serializable {
/**
* 总金额
*/
@Column(name = "sales_order_itme_total_amount")
private BigDecimal salesOrderItmeTotalAmount;
@Column(name = "sales_order_item_total_amount")
private BigDecimal salesOrderItemTotalAmount;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/salesOrder/domain/dto/SalesOrderItemDto.java 0 → 100644
View file @ 0cb62a27
package com.huigou.topsun.sap.salesOrder.domain.dto;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class SalesOrderItemDto implements Serializable {
/**
* 销售订单id
*/
private String salesOrderId;
/**
* 销售单号
*/
private String salesOrderCode;
/**
* 订单类型
*/
private String salesOrderType;
/**
* 客户
*/
private String salesOrderCustomer;
/**
* 客户单号
*/
private String salesOrderCustomerCode;
/**
* 下单日期
*/
private Date salesOrderDate;
/**
* 交易币别
*/
private String salesOrderCurrency;
/**
* 交易倍数
*/
private String salesOrderMultiple;
/**
* 款式
*/
private String salesOrderStyle;
/**
* 申购/采购单号
*/
private String salesOrderProcureCode;
/**
* 跟单员
*/
private String salesOrderMerchandiser;
/**
* 备注
*/
private String salesOrderRemarks;
/**
* 创建时间
*/
private Date salesOrderCreateTime;
/**
* 创建人
*/
private String salesOrderCreator;
/**
* 审批时间
*/
private Date salesOrderApprovalTime;
/**
* 审核人
*/
private String salesOrderReviewer;
/**
* 销售订单明细id
*/
private String salesOrderItemId;
/**
* 销售项次
*/
private String salesOrderItemNumber;
/**
* 产品
*/
private String salesOrderItemProduct;
/**
* 客户产品编码
*/
private String salesOrderItemProductCode;
/**
* 客户产品名称
*/
private String salesOrderItemProductName;
/**
* 订单量
*/
private String salesOrderItemProductOrderCount;
/**
* loss数
*/
private String salesOrderItemLossCount;
/**
* 单位
*/
private String salesOrderItemUnit;
/**
* 尺码单位
*/
private String salesOrderItemSizeUnit;
/**
* 交货日期
*/
private Date salesOrderItemDeliveryDate;
/**
* 指令号
*/
private String salesOrderItemInstructionCode;
/**
* 型体号
*/
private String salesOrderItemFormCode;
/**
* 配色号
*/
private String salesOrderItemColorCode;
/**
* 产品用途
*/
private String salesOrderItemUsage;
/**
* 段别
*/
private String salesOrderItemDifference;
/**
* 周期
*/
private String salesOrderItemCycle;
/**
* 季度
*/
private String salesOrderItemQuarter;
/**
* 产地
*/
private String salesOrderItemProducer;
/**
* PO号
*/
private String salesOrderItemPoCode;
/**
* WIP号
*/
private String salesOrderItemWipCode;
/**
* 装箱数
*/
private String salesOrderItemPackingCount;
/**
* 销线
*/
private String salesOrderItemSalesLine;
/**
* 产品规格
*/
private String salesOrderItemSpecifications;
/**
* SK编号
*/
private String salesOrderItemSkCode;
/**
* 专利号
*/
private String salesOrderItemPatentCode;
/**
* 材质描述
*/
private String salesOrderItemMaterialDescription;
/**
* 销售订单明细表备注
*/
private String salesOrderItemRemarks;
/**
* 签收人
*/
private String salesOrderItemSignee;
/**
* SHIP TO ID
*/
private String salesOrderItemShipToId;
/**
* 包装方式
*/
private String salesOrderItemPackingMethod;
/**
* 印刷方向
*/
private String salesOrderItemPrintDirection;
/**
* 单价
*/
private BigDecimal salesOrderItemUnitPrice;
/**
* 总金额
*/
private BigDecimal salesOrderItemTotalAmount;
/**
* 销售订单其他信息id
*/
private String salesOrderOtherInfoId;
/**
* 尺码
*/
private String salesOrderOtherInfoSize;
/**
* 指令数
*/
private String salesOrderOtherInfoInstructionCount;
/**
* loss数
*/
private String salesOrderOtherInfoLossCount;
/**
* 销售订单其他信息备注
*/
private String salesOrderOtherInfoRemarks;
/**
* 生产工单号
*/
private String salesOrderOtherInfoManufactureCode;
}
topsun/src/main/java/com/huigou/topsun/sap/salesOrder/domain/vo/SapSalesOrderItemVo.java
View file @ 0cb62a27
......@@ -122,7 +122,7 @@ public class SapSalesOrderItemVo implements Serializable {
/**
* 销线
*/
private String salesOrderItemSelesLine;
private String salesOrderItemSalesLine;
/**
* 产品规格
......@@ -147,7 +147,7 @@ public class SapSalesOrderItemVo implements Serializable {
/**
* 销售订单明细表备注
*/
private String selesOrderItemRemarks;
private String salesOrderItemRemarks;
/**
* 签收人
......@@ -167,7 +167,7 @@ public class SapSalesOrderItemVo implements Serializable {
/**
* 印刷方向
*/
private String salesOrderItmePrintDirection;
private String salesOrderItemPrintDirection;
/**
* 单价
......@@ -177,6 +177,6 @@ public class SapSalesOrderItemVo implements Serializable {
/**
* 总金额
*/
private BigDecimal salesOrderItmeTotalAmount;
private BigDecimal salesOrderItemTotalAmount;
}
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