Skip to content

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

重写前端页面

parent d52b91c5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 502 additions and 102 deletions
topsun-xt/src/main/webapp/biz/topsun/customer/customerDetail.jsp
View file @ 447472d2
...@@ -27,12 +27,20 @@ ...@@ -27,12 +27,20 @@
<x:hidden name="positionName"/> <x:hidden name="positionName"/>
<x:hidden name="personMemberId"/> <x:hidden name="personMemberId"/>
<x:hidden name="personMemberName"/> <x:hidden name="personMemberName"/>
<div><h3>客户基本信息</h3></div>
<div style="margin: 10px;"> <div id="customerTab" style="margin: 0px;">
<div class="hg-form-cols"> <div class="ui-tab-links">
<ul id="customer_ul">
<li id="customerBaseInfo" divid="customerBaseInfoDiv">客户基本信息</li>
<li id="customerDebtContact" divid="customerDebtContactDiv">催货款通知邮箱</li>
<li id="customerOtherInfo" divid="customerOtherInfoDiv">其他信息</li>
</ul>
</div>
<div class="ui-tab-content" style="padding: 2px; padding-right: 0;">
<div class="hg-form-cols" id="customerBaseInfoDiv">
<x:hidden name="customerId"/> <x:hidden name="customerId"/>
<x:hidden name="customerBankId"/> <x:hidden name="customerBankId"/>
<%-- <x:hidden name="customerId"/>--%>
<x:inputC name="customerCode" label="客户编码" labelCol="1" fieldCol="2"/> <x:inputC name="customerCode" label="客户编码" labelCol="1" fieldCol="2"/>
<x:inputC name="customerName" label="客户全称" labelCol="1" fieldCol="2"/> <x:inputC name="customerName" label="客户全称" labelCol="1" fieldCol="2"/>
<x:inputC name="customerShortName" label="客户简称" labelCol="1" fieldCol="2"/> <x:inputC name="customerShortName" label="客户简称" labelCol="1" fieldCol="2"/>
...@@ -49,35 +57,113 @@ ...@@ -49,35 +57,113 @@
<x:inputC name="customerAccountNo" label="银行账户" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="customerAccountNo" label="银行账户" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="customerAccountName" label="户名" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="customerAccountName" label="户名" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="customerCorporation" label="公司法人" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="customerCorporation" label="公司法人" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="businessRegistrationNumber" label="工商注册号" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="businessRegistrationNumber" label="工商注册号" maxLength="32" labelCol="1"
<x:inputC name="nationalTaxRegistrationNumber" label="国税注册号" maxLength="32" labelCol="1" fieldCol="2"/> fieldCol="2"/>
<%-- <x:inputC name="nationalTaxRegistrationNumber" label="订单性质" maxLength="32" labelCol="1" fieldCol="2"/>--%> <x:inputC name="nationalTaxRegistrationNumber" label="国税注册号" maxLength="32" labelCol="1"
<%-- <x:inputC name="nationalTaxRegistrationNumber" label="品牌" maxLength="32" labelCol="1" fieldCol="2"/>--%> fieldCol="2"/>
<%-- <x:inputC name="nationalTaxRegistrationNumber" label="做账难度等级" maxLength="32" labelCol="1" fieldCol="2"/>--%> </div>
<%-- <x:inputC name="nationalTaxRegistrationNumber" label="月结方式" maxLength="32" labelCol="1" fieldCol="2"/>--%> <div id="customerDebtContactDiv">
<%-- <x:inputC name="nationalTaxRegistrationNumber" label="扣款" maxLength="32" labelCol="1" fieldCol="2"/>--%> <div id='emailTab' style="margin: 0px;">
<%-- <x:inputC name="nationalTaxRegistrationNumber" label="月结方式" maxLength="32" labelCol="1" fieldCol="2"/>--%> <div class="ui-tab-links">
<ul id="email_ul">
<li id="baoshenEmailListForm" divid="baoshenEmailListGrid">宝绅邮箱</li>
<li id="customerEmailListForm" divid="customerEmailListGrid">客户邮箱</li>
</ul>
</div>
</div> </div>
</div> </div>
<div id="contact" position="center"> <div id="customerOtherInfoDiv">
<x:title title="客户列表" name="group"/> <div id="customerRelated" position="center">
<div id="contactListGrid" style="margin: 2px;"> <x:title title="客户关联关系信息" name="group"/>
<div id="customerRelatedListGrid" style="margin: 2px;">
<hr> <hr>
</div> </div>
</div> </div>
<div id="customerPayInfo" position="center">
<x:title title="客户付款信息" name="group"/>
<div id="customerPayInfoListGrid" style="margin: 2px;">
<hr>
</div>
</div>
</div>
</div>
<%-- <div><h3>客户基本信息</h3></div>--%>
<%-- <div style="margin: 10px;">--%>
<%-- <div class="hg-form-cols">--%>
<%-- <x:hidden name="customerId"/>--%>
<%-- <x:hidden name="customerBankId"/>--%>
<%-- <x:inputC name="customerCode" label="客户编码" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerName" label="客户全称" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerShortName" label="客户简称" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerWorkTime" label="客户工作时间" wrapper="date" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerEnName" label="英文名称" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerEnShortName" label="英文名简称" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="provinceInfo" label="所属地区" maxLength="32" labelCol="1" fieldCol="2" readonly="true"/>--%>
<%-- <x:inputC name="customerLevel" label="客户等级" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerFactoryCode" label="工厂代号" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerAddress" label="地址" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerGroup" label="所属集团" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerZipCode" label="邮编" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerBankDeposit" label="开户银行" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerAccountNo" label="银行账户" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerAccountName" label="户名" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="customerCorporation" label="公司法人" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="businessRegistrationNumber" label="工商注册号" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<%-- <x:inputC name="nationalTaxRegistrationNumber" label="国税注册号" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<div class="blank_div clearfix"></div> <%-- </div>--%>
<div><h3>催货通知邮箱</h3></div> <%-- <div id="contact" position="center">--%>
<%-- <x:title title="客户列表" name="group"/>--%>
<%-- <div id="contactListGrid" style="margin: 2px;">--%>
<%-- <hr>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- <div class="blank_div clearfix"></div>--%>
<%-- <div><h3>催货通知邮箱</h3>--%>
<%-- <div id='pageTab' style="margin: 0px;">--%>
<%-- <div class="ui-tab-links">--%>
<%-- <ul id="menu_ul">--%>
<%-- <li id="detailForm" divid="baoshenEmailListGrid">宝绅邮箱</li>--%>
<%-- <li id="lossForm" divid="customerEmailListGrid">客户邮箱</li>--%>
<%-- </ul>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- <div id="baoshenEmail" position="center">--%>
<%-- <x:title title="宝绅邮箱" name="group"/>--%>
<%-- <div id="baoshenEmailListGrid" style="margin: 2px;">--%>
<%-- <hr>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- <div id="customerEmail" position="center">--%>
<%-- <x:title title="客户邮箱" name="group"/>--%>
<%-- <div id="customerEmailListGrid" style="margin: 2px;">--%>
<%-- <hr>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="blank_div clearfix"></div>
<div><h3>其他信息</h3></div>
<%-- <div class="blank_div clearfix"></div>--%>
<%-- <div><h3>其他信息</h3>--%>
<%-- <div id="customerRelated" position="center">--%>
<%-- <x:title title="客户关联关系信息" name="group"/>--%>
<%-- <div id="customerRelatedListGrid" style="margin: 2px;">--%>
<%-- <hr>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- <div id="customerPayInfo" position="center">--%>
<%-- <x:title title="客户付款信息" name="group"/>--%>
<%-- <div id="customerPayInfoListGrid" style="margin: 2px;">--%>
<%-- <hr>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
</form> </form>
......
topsun/src/main/java/com/huigou/topsun/customer/application/CustomerDebtContactApplication.java
View file @ 447472d2
...@@ -8,9 +8,8 @@ import java.util.List; ...@@ -8,9 +8,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public interface CustomerDebtContactApplication { public interface CustomerDebtContactApplication {
public static final String QUERY_XML_FILE_PATH = "config/topsun/customer/customerMapper.xml";
Map<String, Object> getCustomerDebtContactList(CustomerDebtContactQueryRequest queryRequest); List<CustomerDebtContact> getCustomerDebtContactList(String customerId,String customerEmailType);
CustomerDebtContactVo saveCustomerDebtContact(CustomerDebtContact customerDebtContact); CustomerDebtContactVo saveCustomerDebtContact(CustomerDebtContact customerDebtContact);
......
topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerApplicationImpl.java
View file @ 447472d2
...@@ -35,7 +35,7 @@ public class CustomerApplicationImpl extends BaseApplication implements Customer ...@@ -35,7 +35,7 @@ public class CustomerApplicationImpl extends BaseApplication implements Customer
/** /**
* 分页查询联系人信息 * 分页查询联系人信息
* @param contactQueryRequest * @param customerId
* @return * @return
*/ */
@Override @Override
......
topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerDebtContactApplicationImpl.java
View file @ 447472d2
...@@ -4,6 +4,7 @@ import com.huigou.cache.DictUtil; ...@@ -4,6 +4,7 @@ import com.huigou.cache.DictUtil;
import com.huigou.data.query.model.QueryDescriptor; import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel; import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.customer.application.CustomerDebtContactApplication; import com.huigou.topsun.customer.application.CustomerDebtContactApplication;
import com.huigou.topsun.customer.domain.CustomerContact;
import com.huigou.topsun.customer.domain.CustomerDebtContact; import com.huigou.topsun.customer.domain.CustomerDebtContact;
import com.huigou.topsun.customer.domain.query.CustomerDebtContactQueryRequest; import com.huigou.topsun.customer.domain.query.CustomerDebtContactQueryRequest;
import com.huigou.topsun.customer.domain.vo.CustomerDebtContactVo; import com.huigou.topsun.customer.domain.vo.CustomerDebtContactVo;
...@@ -21,16 +22,14 @@ public class CustomerDebtContactApplicationImpl extends BaseApplication implemen ...@@ -21,16 +22,14 @@ public class CustomerDebtContactApplicationImpl extends BaseApplication implemen
// 导入催货款通知邮箱Dao层 // 导入催货款通知邮箱Dao层
@Autowired @Autowired
private CustomerDebtContactRepository customerDebtContactRepository; private CustomerDebtContactRepository customerDebtContactRepository;
public static final String QUERY_XML_FILE_PATH = "config/topsun/customer/customerMapper.xml";
@Override @Override
public Map<String, Object> getCustomerDebtContactList(CustomerDebtContactQueryRequest queryRequest) { public List<CustomerDebtContact> getCustomerDebtContactList(String customerId,String customerEmailType) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "customerDebtContact"); QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "customerDebtContact");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest); List<CustomerDebtContact> customerDebtContactList = this.sqlExecutorDao.queryToList(queryDescriptor.getSql(), CustomerDebtContact.class, customerId,customerEmailType);
queryModel.putDictionary("customerEmailType", DictUtil.getDictionary("customerEmailType")); return customerDebtContactList;
queryModel.putDictionary("sendEamil", DictUtil.getDictionary("sendEamil"));
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
return map;
} }
@Override @Override
......
topsun/src/main/java/com/huigou/topsun/customer/controller/CustomerController.java
View file @ 447472d2
package com.huigou.topsun.customer.controller; package com.huigou.topsun.customer.controller;
import cn.hutool.core.bean.BeanUtil;
import com.huigou.topsun.customer.application.CustomerBaseInfoApplication; import com.huigou.topsun.customer.application.CustomerBaseInfoApplication;
import com.huigou.topsun.customer.application.CustomerApplication; import com.huigou.topsun.customer.application.CustomerApplication;
import com.huigou.topsun.customer.domain.CustomerBank; import com.huigou.topsun.customer.domain.CustomerBank;
import com.huigou.topsun.customer.domain.CustomerContact;
import com.huigou.topsun.customer.domain.query.ContactQueryRequest;
import com.huigou.topsun.customer.domain.query.CustomerQueryRequest; import com.huigou.topsun.customer.domain.query.CustomerQueryRequest;
import com.huigou.topsun.customer.domain.Province; import com.huigou.topsun.customer.domain.Province;
import com.huigou.topsun.customer.domain.vo.CustomerVo; import com.huigou.topsun.customer.domain.vo.CustomerVo;
import com.huigou.uasp.annotation.ControllerMapping; import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController; import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO; import com.huigou.util.SDO;
import com.sun.xml.bind.v2.TODO;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
topsun/src/main/java/com/huigou/topsun/customer/controller/CustomerDebtContactController.java
View file @ 447472d2
...@@ -34,18 +34,16 @@ public class CustomerDebtContactController extends CommonController { ...@@ -34,18 +34,16 @@ public class CustomerDebtContactController extends CommonController {
/** /**
* 获取催货款通知邮箱 * 获取催货款通知邮箱
*/ */
@SkipAuth
public String slicedCustomerDebtContactList() { public String slicedCustomerDebtContactList() {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
CustomerDebtContactQueryRequest queryRequest = sdo.toQueryRequest(CustomerDebtContactQueryRequest.class); String customerId = sdo.getString("customerId");
String customerEmailType = sdo.getString("customerEmailType");
return toResult(customerDebtContactApplication.getCustomerDebtContactList(queryRequest)); return packGridDataAndResult(customerDebtContactApplication.getCustomerDebtContactList(customerId,customerEmailType));
} }
/** /**
* 新增催货款通知邮箱 * 新增催货款通知邮箱
*/ */
@SkipAuth
public String saveCustomerDebtContact() { public String saveCustomerDebtContact() {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
CustomerDebtContactVo customerDebtContactVo = sdo.toObject(CustomerDebtContactVo.class); CustomerDebtContactVo customerDebtContactVo = sdo.toObject(CustomerDebtContactVo.class);
...@@ -63,7 +61,6 @@ public class CustomerDebtContactController extends CommonController { ...@@ -63,7 +61,6 @@ public class CustomerDebtContactController extends CommonController {
/** /**
* 删除催货款信息邮箱 * 删除催货款信息邮箱
*/ */
@SkipAuth
public String deleteCustomerDebtContact() { public String deleteCustomerDebtContact() {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
List<String> ids = sdo.getIds(); List<String> ids = sdo.getIds();
......
topsun/src/main/java/com/huigou/topsun/customer/domain/CustomerDebtContact.java
View file @ 447472d2
...@@ -30,8 +30,8 @@ public class CustomerDebtContact implements Serializable { ...@@ -30,8 +30,8 @@ public class CustomerDebtContact implements Serializable {
/** /**
* 邮箱地址 * 邮箱地址
*/ */
@Column(name = "customer_eamil") @Column(name = "customer_email")
private String customerEamil; private String customerEmail;
/** /**
* 联系人 * 联系人
...@@ -42,8 +42,8 @@ public class CustomerDebtContact implements Serializable { ...@@ -42,8 +42,8 @@ public class CustomerDebtContact implements Serializable {
/** /**
* 是否开启邮件发送 * 是否开启邮件发送
*/ */
@Column(name = "send_eamil") @Column(name = "send_email")
private String sendEamil; private String sendEmail;
/** /**
* 邮箱类型（customerEmailType）-（宝绅邮箱、客户邮箱） * 邮箱类型（customerEmailType）-（宝绅邮箱、客户邮箱）
......
topsun/src/main/java/com/huigou/topsun/customer/domain/query/CustomerDebtContactQueryRequest.java
View file @ 447472d2
...@@ -26,7 +26,7 @@ public class CustomerDebtContactQueryRequest extends QueryAbstractRequest { ...@@ -26,7 +26,7 @@ public class CustomerDebtContactQueryRequest extends QueryAbstractRequest {
/** /**
* 邮箱地址 * 邮箱地址
*/ */
private String customerEamil; private String customerEmail;
/** /**
* 联系人 * 联系人
...@@ -36,7 +36,7 @@ public class CustomerDebtContactQueryRequest extends QueryAbstractRequest { ...@@ -36,7 +36,7 @@ public class CustomerDebtContactQueryRequest extends QueryAbstractRequest {
/** /**
* 是否开启邮件发送 * 是否开启邮件发送
*/ */
private String sendEamil; private String sendEmail;
/** /**
* 邮箱类型（customerEmailType）-（宝绅邮箱、客户邮箱） * 邮箱类型（customerEmailType）-（宝绅邮箱、客户邮箱）
......
topsun/src/main/java/com/huigou/topsun/customer/domain/vo/CustomerDebtContactVo.java
View file @ 447472d2
...@@ -30,7 +30,7 @@ public class CustomerDebtContactVo implements Serializable { ...@@ -30,7 +30,7 @@ public class CustomerDebtContactVo implements Serializable {
/** /**
* 邮箱地址 * 邮箱地址
*/ */
private String customerEamil; private String customerEmail;
/** /**
* 联系人 * 联系人
...@@ -40,7 +40,7 @@ public class CustomerDebtContactVo implements Serializable { ...@@ -40,7 +40,7 @@ public class CustomerDebtContactVo implements Serializable {
/** /**
* 是否开启邮件发送 * 是否开启邮件发送
*/ */
private String sendEamil; private String sendEmail;
/** /**
* 邮箱类型（customerEmailType）-（宝绅邮箱、客户邮箱） * 邮箱类型（customerEmailType）-（宝绅邮箱、客户邮箱）
......
topsun/target/classes/config/content/easysearch/easy-search-product.xml
View file @ 447472d2
...@@ -29,18 +29,58 @@ ...@@ -29,18 +29,58 @@
<easy-search name="productDetail" desc="产品详情"> <easy-search name="productDetail" desc="产品详情">
<sql> <sql>
SELECT SELECT
p.product_name, pc.product_category_name,pl.*, pi.*,p.product_name,p.product_status,p.product_unit,p.brand_name,
ppc.modulus,ppc.row_num,ppc.column_num,ppc.contact_num,ppc.row_double_blade,ppc.column_double_blade,ppc.dispatch_multiple,ppc.sheet_length,ppc.sheet_width,ppc.product_sheet_conf, p.is_build_bom, p.confirm_date,
pl2.product_loss_max,pl2.product_loss_rate,pl2.product_loss_redundance,pl2.product_loss_remark,pl2.customer_name p.comfirm_person, p.is_free_inspection, p.is_no_quality_loss, p.sample_order_no,
FROM product p p.stock_no, p.stock_name, p.file_no,
LEFT JOIN product_category pc ON pc.product_category_id = p.product_category_id pd.product_english_name,
LEFT JOIN product_detail pd ON pd.product_id = p.product_id wa.work_instruction_apply_id, wa.specification_no, wa.matrixing_value, wa.size_group_id,
LEFT JOIN product_looked pl ON pl.product_id = p.product_id wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,
LEFT JOIN product_published_conf ppc ON ppc.product_id = p.product_id wa.is_attached_sample, wa.is_only_code, wa.is_body_color,wa.brand,wa.store_name,
LEFT JOIN product_loss pl2 ON pl2.product_id = p.product_id pl.proofing_make_looked_id, pl.is_output, pl.is_out, pl.is_change,
pl.plastic_bag_structure, pl.product_length, pl.product_width, pl.product_height,
pl.product_thick, pl.product_single_layer, pl.product_layer_num, pl.sample_shape,
pl.sample_shape_size, pl.planned_flow_id, pl.file_storage_location, pl.sample_material,
pl.product_weight, pl.product_aperture, pl.product_single_weight, pl.proofing_make_status,
pl.is_confirm,
pc.proofing_make_pd_published_conf_id, pc.modulus, pc.row_num,
pc.column_num, pc.contact_num, pc.row_double_blade, pc.column_double_blade,
pc.dispatch_multiple, pc.sheet_length, pc.sheet_width, pc.print_front_coler,
pc.print_opposite_color
FROM proofing_make_base_info pi
inner JOIN work_instruction_apply wa ON wa.proofing_make_id = pi.proofing_make_id
inner JOIN proofing_make_looked pl ON pl.proofing_make_id = pi.proofing_make_id
inner JOIN proofing_make_pd_published_conf pc ON pc.proofing_make_id = pi.proofing_make_id
inner join product p on pi.product_code=p.product_code
inner join product_detail pd on pd.product_id=p.product_id
where pi.is_delete=0 and wa.is_delete=0
</sql> </sql>
<field name="产品id" title="产品id" code="productId" width="200" /> <field name="产品id" title="产品id" code="productId" width="200" />
<field name="产品编号" title="产品编号" code="productCode" width="200" />
<field name="产品name" title="产品name" code="productName" width="200"/> <field name="产品name" title="产品name" code="productName" width="200"/>
<field name="唯一码产品" title="唯一码产品" code="isOnlyCode" width="200" type='hidden'/>
<field name="不考虑形体配色" title="不考虑形体配色" code="isBodyColor" width="200" type='hidden'/>
<field name="唯一码产品" title="唯一码产品" code="isOnlyCode" width="200" type='hidden'/>
<field name="是否禁用" title="是否禁用" code="isDisable" width="200" type='hidden'/>
<field name="是否创建新作业指导书" title="是否创建新作业指导书" code="isNewSpecification" width="200" type='hidden'/>
<field name="是否建立BON表" title="是否建立BON表" code="isBuildBom" width="200" type='hidden'/>
<field name="是否要鞋图" title="是否要鞋图" code="isShoePattern" width="200" type='hidden'/>
<field name="是否附样品" title="是否附样品" code="isAttachedSample" width="200" type='hidden'/>
<field name="确认日期" title="确认日期" code="confirmDate" width="200" type='hidden'/>
<field name="确认人" title="确认人" code="comfirmPerson" width="200" type='hidden'/>
<field name="是否免检" title="是否免检" code="isFreeInspection" width="200" type='hidden'/>
<field name="不要质量loss" title="不要质量loss" code="isNoQualityLoss" width="200" type='hidden'/>
<field name="样品单号" title="样品单号" code="sampleOrderNo" width="200" type='hidden'/>
<field name="库存编码" title="库存编码" code="stockNo" width="200" type='hidden'/>
<field name="库存名称" title="库存名称" code="stockName" width="200" type='hidden'/>
<field name="存档编号" title="存档编号" code="fileNo" width="200" type='hidden'/>
<field name="品牌" title="品牌" code="brand" width="200" type='hidden'/>
<field name="仓库" title="仓库" code="storeName" width="200" type='hidden'/>
<field name="尺码组" title="尺码组" code="sizeGroupId" width="200" type='hidden'/>
<field name="采购换算值" title="采购换算值" code="matrixingValue" width="200" type='hidden'/>
<field name="制造单号" title="制造单号" code="proofingMakeNo" width="200"/>
<field name="指导申请书单号" title="指导申请书单号" code="workInstructionApplyId" width="200"/>
<field name="长;单位cm" title="长;单位cm" code="productLength" width="200" type='hidden'/> <field name="长;单位cm" title="长;单位cm" code="productLength" width="200" type='hidden'/>
<field name="宽;单位cm" title="宽;单位cm" code="productWidth" width="200" type='hidden'/> <field name="宽;单位cm" title="宽;单位cm" code="productWidth" width="200" type='hidden'/>
<field name="高;单位cm" title="高;单位cm" code="productHeight" width="200" type='hidden'/> <field name="高;单位cm" title="高;单位cm" code="productHeight" width="200" type='hidden'/>
...@@ -54,8 +94,9 @@ ...@@ -54,8 +94,9 @@
<field name="是否防霉" title="是否防霉(is_open)" code="productMould" width="200" type='hidden'/> <field name="是否防霉" title="是否防霉(is_open)" code="productMould" width="200" type='hidden'/>
<field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" type='hidden'/> <field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" type='hidden'/>
<field name="体系认证" title="体系认证" code="productSysCertification" width="200" type='hidden'/> <field name="体系认证" title="体系认证" code="productSysCertification" width="200" type='hidden'/>
<field name="仓库" title="仓库" code="storeName" width="200" type='hidden'/>
<field name="采购单位" title="采购单位" code="productBuyUnit" width="200" type='hidden'/> <field name="采购单位" title="采购单位" code="productBuyUnit" width="200" type='hidden'/>
<field name="排版参数配置id" title="排版参数配置id" code="productPublishedConfId" width="200" type='hidden'/> <field name="排版参数配置id" title="排版参数配置id" code="productPublishedConfId" width="200" type='hidden'/>
<field name="模数" title="模数" code="modulus" width="200" type='hidden'/> <field name="模数" title="模数" code="modulus" width="200" type='hidden'/>
<field name="行数" title="行数" code="rowNum" width="200" type='hidden'/> <field name="行数" title="行数" code="rowNum" width="200" type='hidden'/>
......
topsun/target/classes/config/content/easysearch/easy-search-proofing.xml
View file @ 447472d2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
select pa.proofing_apply_no,pa.proofing_apply_id,pa.product_id,p.product_code select pa.proofing_apply_no,pa.proofing_apply_id,pa.product_id,p.product_code
from proofing_apply_base_info pa from proofing_apply_base_info pa
inner join product p on(pa.product_id=p.product_id) inner join product p on(pa.product_id=p.product_id)
where pa.proofing_apply_application_status != 2 where pa.proofing_apply_application_status != 2 and pa.status =3
</sql> </sql>
<field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" /> <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
<field name="申请Id" title="申请Id" code="proofingApplyId" width="200" /> <field name="申请Id" title="申请Id" code="proofingApplyId" width="200" />
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
proofing_make_base_info pm proofing_make_base_info pm
inner join product p on(pm.product_id=p.product_id) inner join product p on(pm.product_id=p.product_id)
<!-- where pm.proofing_make_application_status ="normal"--> <!-- where pm.proofing_make_application_status ="normal"-->
where pm.is_delete = 0
</sql> </sql>
<field name="产品Id" title="产品Id" code="productId" width="200" /> <field name="产品Id" title="产品Id" code="productId" width="200" />
<field name="产品编号" title="产品编号" code="productCode" width="200" /> <field name="产品编号" title="产品编号" code="productCode" width="200" />
......
topsun/target/classes/config/topsun/proofing/proofingApply.xml
View file @ 447472d2
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
<query name="slicedQuery" table="proofing_apply"> <query name="slicedQuery" table="proofing_apply">
<sql-query> <sql-query>
select t.* from proofing_apply_base_info t select t.* from proofing_apply_base_info t
<!-- where 1=1--> where 1=1
</sql-query> </sql-query>
<!-- <permissions>--> <!-- <permissions>-->
<condition column="proofing_apply_No" name="proofingApplyNo" type="java.lang.String" symbol="like" alias="t"/>
<!-- <permission column="person_member_id" symbol="half_like" alias="t" kind="personId"/>--> <!-- <permission column="person_member_id" symbol="half_like" alias="t" kind="personId"/>-->
<!-- <permission column="full_id" symbol="half_like" alias="t" kind="fullId" manageType="demoQueryLeave,admin"/>--> <!-- <permission column="full_id" symbol="half_like" alias="t" kind="fullId" manageType="demoQueryLeave,admin"/>-->
<!-- </permissions>--> <!-- </permissions>-->
......
topsun/target/classes/config/topsun/proofing/proofingMake.xml
View file @ 447472d2
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
pm.* pm.*
FROM FROM
proofing_make_base_info pm proofing_make_base_info pm
where pm.is_delete = 0
</sql-query> </sql-query>
<condition column="proofing_make_no" name="proofingMakeNo" type="java.lang.String" symbol="like" alias="pm"/>
</query> </query>
<query name="slicedProofingMakeTechnology" table="proofing_Make_technology"> <query name="slicedProofingMakeTechnology" table="proofing_Make_technology">
<sql-query> <sql-query>
......
topsun/target/classes/config/topsun/quotation/quotationItem.xml
View file @ 447472d2
...@@ -4,15 +4,20 @@ ...@@ -4,15 +4,20 @@
<query name="queryQuotationItemList" label="报价明细表" table="quotation_item"> <query name="queryQuotationItemList" label="报价明细表" table="quotation_item">
<sql-query> <sql-query>
SELECT SELECT
qi.*, qi.quotation_item_id,
p.product_name, qi.quotation_id,
p.product_unit, qi.sequence,
pc.product_category_code AS product_code qi.product_id,
FROM qi.price,
quotation_item qi qi.currency,
LEFT JOIN product p ON qi.product_id = p.product_id qi.remark,
LEFT JOIN product_category pc ON p.product_category_id = pc.product_category_id qi.product_name,
where qi.quotation_id = ? qi.product_code_name,
qi.picture,
qi.product_parameter,
qi.tax_price,
qi.moq
FROM quotation_item qi where qi.quotation_id = ?
</sql-query> </sql-query>
</query> </query>
......
topsun/target/classes/config/topsun/technology/technology.xml
View file @ 447472d2
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
technology t technology t
LEFT JOIN technology_process tp ON t.technology_id = tp.technology_id LEFT JOIN technology_process tp ON t.technology_id = tp.technology_id
LEFT JOIN process p ON tp.process_id = p.process_id LEFT JOIN process p ON tp.process_id = p.process_id
LEFT JOIN process_resource pr ON pr.technology_process_id = tp.technology_process_id LEFT JOIN process_resource pr ON pr.process_id = p.process_id
where 1=1 where 1=1
</sql-query> </sql-query>
<condition column="product_id" name="productId" symbol="in" alias="t"/> <condition column="product_id" name="productId" symbol="in" alias="t"/>
......
topsun/target/classes/config/topsun/technology/technologyProcess.xml
View file @ 447472d2
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
p.process_content, p.process_content,
p.process_type, p.process_type,
p.process_remark, p.process_remark,
p.work_hours, p.work_hours<!--,
pr.resource_id, pr.resource_id,
CASE WHEN p.process_type = 'pakeage' THEN CASE WHEN p.process_type = 'pakeage' THEN
( SELECT gxmc FROM res_bz t WHERE t.id = pr.resource_id ) ( SELECT gxmc FROM res_bz t WHERE t.id = pr.resource_id )
...@@ -25,12 +25,10 @@ ...@@ -25,12 +25,10 @@
mi.material_unit, mi.material_unit,
mi.material_number, mi.material_number,
mi.material_json, mi.material_json,
mi.process_material_item_id mi.process_material_item_id-->
FROM FROM
technology_process tp technology_process tp
LEFT JOIN process p ON tp.process_id = p.process_id LEFT JOIN process p ON tp.process_id = p.process_id
LEFT JOIN process_resource pr ON pr.technology_process_id = tp.technology_process_id
LEFT JOIN process_material_item mi ON tp.technology_process_id = mi.technology_process_id
WHERE tp.technology_id = ? WHERE tp.technology_id = ?
</sql-query> </sql-query>
</query> </query>
......
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