销售记录后台导入,必要关联数据全部新建

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/DinasTypeDao.java

@@ -34,4 +34,6 @@ public interface DinasTypeDao extends BaseDao {
     List<KObject> getByRegionalCompanyId(UUID regionalCompanyId);
 
     List<KObject> getStationsById(List<UUID> dinasTypeIds, List<UUID> regionalCompanyIds);
+
+    KObject insertNoInfo(String name, KObject station, KObject organization);
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/RetailInfoDao.java

@@ -31,4 +31,6 @@ public interface RetailInfoDao extends BaseDao {
     Long selectBuyCountByIdCard(String idCard, UUID uuid);
 
     BigDecimal selectBuyAmountByIdCard(String idCard, UUID fromString);
+
+    KObject insertNoInfo(String name, KObject station, KObject organization);
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/StationDao.java

@@ -13,6 +13,8 @@ public interface StationDao extends BaseDao {
 
     Page<KObject> listStationInfoPaging(Page<KObject> page, Integer stationStatus);
 
+    KObject createNoInfoStation(String stationName, KObject organization);
+
     UUID create(KObject kObject);
 
     int selectCountByName(String stationName);
@@ -28,4 +30,6 @@ public interface StationDao extends BaseDao {
 	List<KObject> queryStationByRegionalCompany(UUID uuid);
 
     List<KObject> getStationCameraById(UUID id1);
+
+    KObject insertProductionLine(String productionLineName, KObject station);
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java

@@ -121,6 +121,27 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
     }
 
     @Override
+    public KObject insertNoInfo(String name, KObject station, KObject organization) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
+        KObject staff = AminoContextHolder.getContext().getStaff();
+
+        KObject kObject = bean.newInstance();
+        kObject.set(BaseConstants.ID,UUID.randomUUID());
+        kObject.set("dinasTypeName",name);
+        kObject.set("type",name.contains("砂")?0:1);
+        kObject.set("regionalCompany",organization);
+        kObject.set("reason","导入时新增,请重新维护");
+
+        kObject.set(BaseConstants.CREATOR, staff);
+        kObject.set(BaseConstants.CREATE_TIME, new Date());
+        kObject.set(BaseConstants.DEL, false);
+        template.save(kObject);
+        //勾选和场站的关系
+        checkedStation(kObject.getUuid("id"),station.getUuid("id"));
+        return kObject;
+    }
+
+    @Override
     public DetachedCriteria addRegionalCompanyFilter(DetachedCriteria detachedCriteria) {
         KObject currentLoginRegionalCompany = getCurrentLoginRegionalCompany();
         if (currentLoginRegionalCompany != null && currentLoginRegionalCompany. getString("type").equals(OrganizationTypeEnum.REGIONAL_COMPANY.name())) {
@@ -132,10 +153,8 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
 
     @Override
     public List<KObject> getByName(String name, UUID id) {
-//        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
         KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
-//        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
         detachedCriteria.add(Restrictions.eq("del", false));
         detachedCriteria.add(Restrictions.eq("dinasTypeName", name));
         if (id != null) {

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/RetailInfoDaoImpl.java

@@ -22,10 +22,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate5.HibernateTemplate;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.math.BigInteger;
+import java.security.SecureRandom;
+import java.util.*;
 
 public class RetailInfoDaoImpl extends AbstractBaseDao implements RetailInfoDao, RetailInfoConstant {
 
@@ -143,6 +142,34 @@ public class RetailInfoDaoImpl extends AbstractBaseDao implements RetailInfoDao,
     }
 
     @Override
+    public KObject insertNoInfo(String name, KObject station, KObject organization) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(RetailInfoConstant.ENTITY, KClass.class);
+        KObject kObject = bean.newInstance();
+        kObject.set("station", station);
+        kObject.set("regionalCompany", organization);
+        kObject.set("retailInfoName", name);
+        kObject.set("idCard", getRandom());
+        kObject.set("address", "请维护");
+        kObject.set("reason", "系统新增数据,请修改实际情况");
+        kObject.set("id", UUID.randomUUID());
+
+        kObject.set(BaseConstants.CREATE_TIME, new Date());
+        kObject.set(BaseConstants.DEL, false);
+        template.save(kObject);
+        return kObject;
+    }
+
+    private String getRandom() {
+        StringBuilder s = new StringBuilder();
+        SecureRandom random = new SecureRandom();
+        s.append(random.nextInt(9) + 1);
+        for (int i = 0; i < 17; i++) {
+            s.append(random.nextInt(10));
+        }
+        return s.toString();
+    }
+
+    @Override
     public UUID create(KObject kObject) {
 
         WarehouseUser warehouseUser = WarehouseUserContextHolder.getContext().getWarehouseUser();

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.java

@@ -102,7 +102,6 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
         kobject.set(BaseConstants.MODIFIER,staff);
         kobject.set(BaseConstants.DEL,false);
 
-//        template.deleteAll(id.get("productionLines").toList());
         KObject productions = kobject.get("productionLines");
 
         if(null!=productions){
@@ -121,6 +120,39 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
     }
 
 
+
+    @Override
+    public KObject createNoInfoStation(String stationName, KObject organization) {
+        KObject staff = AminoContextHolder.getContext().getStaff();
+        KClass kClass = Amino.getApplicationMetadataContext().getBean(StationConstant.ENTITY, KClass.class);
+        KObject kObject = kClass.newInstance();
+        kObject.set("regionalCompany",organization);
+        kObject.set("stationName",stationName);
+        kObject.set("id",UUID.randomUUID());
+        kObject.set("stationAddress","导入数据_请重新维护");
+        kObject.set("stationCoordinate","100,100");
+        kObject.set("linkMan","请维护");
+        kObject.set("telephone","13276544444");
+        kObject.set("stationStatus","1");
+        kObject.set(BaseConstants.CREATOR,staff);
+        kObject.set(BaseConstants.CREATE_TIME, new Date());
+        kObject.set(BaseConstants.DEL,false);
+        this.insert(kObject);
+        return kObject;
+    }
+
+
+    @Override
+    public KObject insertProductionLine(String productionLineName, KObject station) {
+        KClass kClass = Amino.getApplicationMetadataContext().getBean(ProductionLineConstant.ENTITY, KClass.class);
+        KObject kObject = kClass.newInstance();
+        kObject.set("id",UUID.randomUUID());
+        kObject.set("station",station);
+        kObject.set("name",productionLineName);
+        template.save(ProductionLineConstant.ENTITY,kObject);
+        return kObject;
+    }
+
     @Override
     public UUID create(KObject kObject) {
         KObject staff = AminoContextHolder.getContext().getStaff();
@@ -147,6 +179,8 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
         return save;
     }
 
+
+
     @Override
     public int selectCountByName(String stationName) {
         String departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id").toString();

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/DischargingDaoImpl.java

@@ -228,6 +228,7 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
             dis.add(criterion);
         }
         detachedCriteria.add(Restrictions.and(dis));
+        detachedCriteria.addOrder(Order.desc("dischargingTime"));
         return detachedCriteria;
     }
 

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/SalesRecordConstant.java

@@ -52,6 +52,10 @@ public interface SalesRecordConstant {
 	public static final String PAYMENTSOURCE = "paymentSource";
 	//销售单号
 	public static final String DEALBILLCODE = "dealBillCode";
+	//毛重
+	public static final String GROSS_WEIGHT = "grossWeight";
+	//皮重
+	public static final String TARE_WEIGHT = "tareWeight";
 	/** 审批状态*/
 	public static final String APPROVE_STATE = "approveState";
 	/**

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesRecordDao.java

@@ -16,4 +16,6 @@ public interface SalesRecordDao {
     void saveAstTransportRecord(KObject salesRecord, KObject cardInfo);
 
     KObject findCardByPlateNumber(String string, KObject kObject);
+
+    void insertList(List<KObject> salesRecordInfos);
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/SalesRecordDaoImpl.java

@@ -9,7 +9,6 @@ import com.beecode.amino.core.Amino;
 import com.beecode.bcp.serial.Serial;
 import com.beecode.bcp.type.KClass;
 import com.beecode.inz.common.BaseConstants;
-import com.beecode.inz.common.util.DateTimeUtils;
 import com.beecode.util.DateUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.hibernate.HibernateException;
@@ -42,28 +41,28 @@ public class SalesRecordDaoImpl implements SalesRecordDao, SalesRecordConstant {
     }
 
     @Override
-	public List<Map<String, Object>> getAllSalesRecordByDate(String dateNow ,String dateBefore) {
+    public List<Map<String, Object>> getAllSalesRecordByDate(String dateNow, String dateBefore) {
         // TODO Auto-generated method stub
         String sql = "select ss.project_id,ss.purchase_sand_company_id,ss.station_id,ss.dinas_type_id,sum(ss.deal_amount),sum(ss.amount) from  xyst_dinas_sales_record ss where (ss.deal_time >= :startDate and  ss.deal_time < :endDate ) GROUP BY ss.project_id,ss.purchase_sand_company_id,ss.station_id,ss.dinas_type_id";
-		 return (List<Map<String, Object>>)template.execute(new HibernateCallback<List<Map<String, Object>>>() {
+        return template.execute(new HibernateCallback<List<Map<String, Object>>>() {
             @Override
             public List<Map<String, Object>> doInHibernate(Session session) throws HibernateException {
                 @SuppressWarnings("unchecked")
-				Query<Tuple> query = session.createNativeQuery(sql,Tuple.class);
+                Query<Tuple> query = session.createNativeQuery(sql, Tuple.class);
                 query.setParameter("endDate", dateNow);
                 query.setParameter("startDate", dateBefore);
                 List<Tuple> resultList = query.getResultList();
                 if (resultList.isEmpty())
                     return null;
                 List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-				for(Tuple resule:resultList) {
-					Map<String, Object> map=new HashMap<String,Object>();
+                for (Tuple resule : resultList) {
+                    Map<String, Object> map = new HashMap<String, Object>();
                     map.put("project_id", Convert.toUUID(resule.get(0)));
                     map.put("purchase_sand_company_id", Convert.toUUID(resule.get(1)));
                     map.put("station_id", Convert.toUUID(resule.get(2)));
                     map.put("dinas_type_id", Convert.toUUID(resule.get(3)));
-					map.put("deal_amount", resule.get(4,BigDecimal.class));
-					map.put("amount", resule.get(5,BigDecimal.class));
+                    map.put("deal_amount", resule.get(4, BigDecimal.class));
+                    map.put("amount", resule.get(5, BigDecimal.class));
                     list.add(map);
                 }
                 return list;
@@ -75,17 +74,17 @@ public class SalesRecordDaoImpl implements SalesRecordDao, SalesRecordConstant {
     public void saveAstTransportRecord(KObject salesRecord, KObject cardInfo) {
         KClass bean = Amino.getStaticMetadataContext().getBean(TRANSPORT_RECORD_ENTITY, KClass.class);
         KObject kObject = bean.newInstance();
-        kObject.set(BaseConstants.ID,UUID.randomUUID());
-        kObject.set(BaseConstants.DEL,false);
-        kObject.set(BaseConstants.DISCARD,false);
-        Serial serial = (Serial)Amino.getApplicationMetadataContext().getBean(TRANSPORT_RECORD_ENTITY_SERIAL);
+        kObject.set(BaseConstants.ID, UUID.randomUUID());
+        kObject.set(BaseConstants.DEL, false);
+        kObject.set(BaseConstants.DISCARD, false);
+        Serial serial = (Serial) Amino.getApplicationMetadataContext().getBean(TRANSPORT_RECORD_ENTITY_SERIAL);
         String s = serial.generateString(kObject);
-        kObject.set("billCode",s+ DateUtil.convertTimeToString(salesRecord.getDate(SalesRecordConstant.DEALTIME)));
-        kObject.set(BaseConstants.CREATE_TIME,new Date());
-        kObject.set(REGIONALCOMPANY,salesRecord.get(REGIONALCOMPANY));
-        kObject.set("saleRecord",salesRecord);
-        kObject.set("transportVehicle",cardInfo);
-        kObject.set("confirmStatus",0);
+        kObject.set("billCode", s + DateUtil.convertTimeToString(salesRecord.getDate(SalesRecordConstant.DEALTIME)));
+        kObject.set(BaseConstants.CREATE_TIME, new Date());
+        kObject.set(REGIONALCOMPANY, salesRecord.get(REGIONALCOMPANY));
+        kObject.set("saleRecord", salesRecord);
+        kObject.set("transportVehicle", cardInfo);
+        kObject.set("confirmStatus", 0);
     }
 
     @Override
@@ -93,11 +92,21 @@ public class SalesRecordDaoImpl implements SalesRecordDao, SalesRecordConstant {
         KClass bean = Amino.getStaticMetadataContext().getBean(TRANSPORT_VEHICLE_ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         detachedCriteria.add(Restrictions.eq("plateNumber", string));
-        detachedCriteria.add(Restrictions.eq(REGIONALCOMPANY+"."+BaseConstants.ID, kObject.getUuid(BaseConstants.ID)));
+        detachedCriteria.add(Restrictions.eq(REGIONALCOMPANY + "." + BaseConstants.ID, kObject.getUuid(BaseConstants.ID)));
         List<?> byCriteria = template.findByCriteria(detachedCriteria);
-        if(CollectionUtils.isNotEmpty(byCriteria)&&byCriteria.size()>0){
+        if (CollectionUtils.isNotEmpty(byCriteria) && byCriteria.size() > 0) {
             return (KObject) byCriteria.get(0);
         }
         return null;
     }
+
+    @Override
+    public void insertList(List<KObject> salesRecordInfos) {
+        template.execute(session -> {
+            for (KObject d : salesRecordInfos) {
+                session.save(d);
+            }
+            return null;
+        });
+    }
 }
\ No newline at end of file

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesRecordService.java

 package com.xyst.dinas.sales.service;
 
+import java.util.HashMap;
 import java.util.List;
-import java.util.UUID;
 
 import com.xyst.dinas.sales.web.info.SalesRecordInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 public interface SalesRecordService {
 
@@ -14,4 +15,6 @@ public interface SalesRecordService {
 	 * @return 返回存储状态 failure/失败  success/成功
 	 */
 	String saveSalesRecordService(List<SalesRecordInfo> salesRecordList);
+
+    HashMap<String,Object> qualityReportExcelImport(MultipartFile file);
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesRecordController.java

 package com.xyst.dinas.sales.web;
 
+import java.util.HashMap;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
 import com.xyst.dinas.sales.service.SalesRecordService;
 import com.xyst.dinas.sales.web.info.SalesRecordInfo;
-import com.xyst.dinas.sales.web.info.SyncException;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 public class SalesRecordController {
@@ -34,4 +35,22 @@ public class SalesRecordController {
 		}
 	}
 
+	/**
+	 * create by: 导入销售记录,没有的数据全部新建
+	 * create time: 2019/12/7 12:22
+	 */
+	@PostMapping("/reportExcelImport")
+	public ResponseObj reportExcelImport(MultipartFile file) {
+		if(file == null){
+			return ResponseObj.error(500, "附件为空",null);
+		}
+		HashMap<String, Object> stringObjectHashMap = salesRecordService.qualityReportExcelImport(file);
+		if(stringObjectHashMap!=null&&!stringObjectHashMap.isEmpty()){
+			if(stringObjectHashMap.containsKey("message")) {
+				return ResponseObj.error(500,"导入失败",stringObjectHashMap.get("message"));
+			}
+
+		}
+		return ResponseObj.success("success");
+	}
 }

backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/SalesRecord.mk

@@ -61,11 +61,21 @@
 			<attribute id='9ed97388-563a-4634-a555-b56bb1664dd0' name='carInfo' columnName='car_info' title='车辆信息' type='string' default='' precision='' isArray='false'>
  				<annotation id='9f44e7df-2ecb-490d-a420-2f53f09e3c38' attributeId='fe172826-06ad-4e73-9a8c-5dbab39d0394' name='length' value='20'></annotation>
 			</attribute>
-			<attribute id='d307fa81-7819-4216-887c-2a0fdffd3190' name='dealAmount' columnName='deal_amount' title='销售数量' type='fixnum' default='' precision='' isArray='false'>
+			<attribute id='d307fa81-7819-4216-887c-2a0fdffd3190' name='dealAmount' columnName='deal_amount' title='净重' type='fixnum' default='' precision='' isArray='false'>
     			<annotation id='8f3f5db5-4480-4a68-9399-cbec70cd118a' attributeId='cf1e0d8f-784b-4587-83a3-1167fc10042f' name='length' value='100'></annotation>
    				<annotation id='c342cc44-eabb-4f24-8872-b3cd6085b269' attributeId='1faca45c-ea26-47cc-a2ef-ae00daf88586' name='precision' value='12'></annotation>
    				<annotation id='ae5380d7-75c6-44ff-862f-c9d6c3af409d' attributeId='88762e9e-7c48-40e0-aac1-abcf20e9071a' name='scale' value='4'></annotation>
    			</attribute>
+			<attribute id='c4a69b63-8456-4e68-a7d3-b775bf2709c3' name='grossWeight' columnName='gross_weight' title='毛重' type='fixnum' default='' precision='' isArray='false'>
+    			<annotation id='39f8e296-529b-4dfc-8d22-9a553d3a667f' attributeId='c484caff-a78f-415c-a00d-80aa30cea477' name='length' value='100'></annotation>
+   				<annotation id='a30c74ee-a692-4975-a98e-37b81061b580' attributeId='39eea597-3d56-4309-82c4-9017051c19bd' name='precision' value='12'></annotation>
+   				<annotation id='db9cf1ad-638b-44b9-9334-fee88d616a0f' attributeId='a0ce7d48-bd5b-4b52-8385-db55db584e52' name='scale' value='4'></annotation>
+   			</attribute>
+			<attribute id='39139a55-c45f-4545-873a-225e19efd651' name='tareWeight' columnName='tare_weight' title='皮重' type='fixnum' default='' precision='' isArray='false'>
+    			<annotation id='d665032d-1bac-4ae4-b021-d87275102644' attributeId='b6798e45-f786-40a9-b838-e58de645c77a' name='length' value='100'></annotation>
+   				<annotation id='c2e4e3b4-0ac0-42e5-adc1-bc70e8610579' attributeId='3e7fc89a-6e4b-4660-aa98-b9c10d53d0bc' name='precision' value='12'></annotation>
+   				<annotation id='ed5158d4-b302-4341-ba5b-f301365753a4' attributeId='e176d706-6093-4ee5-bc9f-bbb3c964960f' name='scale' value='4'></annotation>
+   			</attribute>
    			<attribute id='35c5c23b-bb32-4e2d-909a-712cfadd3519' name='price' columnName='price' title='单价' type='fixnum' default='' precision='' isArray='false'>
     				<annotation id='5efadf89-6201-4ee6-9088-473404a74f6d' attributeId='e846437b-1583-4068-9690-262ec2c98b61' name='length' value='100'></annotation>
    				<annotation id='d81f33ea-7612-45c3-9bdd-089af6abd635' attributeId='a5d530ef-9a7d-433e-93c3-240c9fbc7178' name='precision' value='12'></annotation>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesRecord.jmx

@@ -419,6 +419,70 @@
 								</m:property>
 								<m:property>
 									<m:key>scale</m:key>
+									<m:value>4</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+						<m:annotation>
+							<m:type>javax.persistence.Column</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>gross_weight</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+					</m:annotations>
+					<m:id>c4a69b63-8456-4e68-a7d3-b775bf2709c3</m:id>
+					<m:name>grossWeight</m:name>
+					<m:title>毛重</m:title>
+					<m:type>fixnum</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.Numeric</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>precision</m:key>
+									<m:value>12</m:value>
+								</m:property>
+								<m:property>
+									<m:key>scale</m:key>
+									<m:value>4</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+						<m:annotation>
+							<m:type>javax.persistence.Column</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>tare_weight</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+					</m:annotations>
+					<m:id>39139a55-c45f-4545-873a-225e19efd651</m:id>
+					<m:name>tareWeight</m:name>
+					<m:title>皮重</m:title>
+					<m:type>fixnum</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.Numeric</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>precision</m:key>
+									<m:value>12</m:value>
+								</m:property>
+								<m:property>
+									<m:key>scale</m:key>
 									<m:value>2</m:value>
 								</m:property>
 							</m:properties>